diff --git a/src/app/modules/slide-ins/slide-in.ts b/src/app/modules/slide-ins/slide-in.ts
index 7c2e03217eb..fcbf7e7bb22 100644
--- a/src/app/modules/slide-ins/slide-in.ts
+++ b/src/app/modules/slide-ins/slide-in.ts
@@ -82,6 +82,16 @@ export class SlideIn extends ComponentStore<SlideInState> {
     };
   });
 
+  closeLast = this.updater((state) => {
+    const newMap = new Map(state.components);
+    const { id } = this.getAliveComponents(newMap).pop();
+    newMap.set(id, { ...newMap.get(id), isComponentAlive: false });
+    this.focusOnTheCloseButton();
+    return {
+      components: newMap,
+    };
+  });
+
   closeAll = this.updater(() => {
     this.focusOnTheCloseButton();
     return {
diff --git a/src/app/pages/apps/components/app-wizard/app-wizard.component.spec.ts b/src/app/pages/apps/components/app-wizard/app-wizard.component.spec.ts
index c1eb03c0baf..be88bceebb8 100644
--- a/src/app/pages/apps/components/app-wizard/app-wizard.component.spec.ts
+++ b/src/app/pages/apps/components/app-wizard/app-wizard.component.spec.ts
@@ -16,14 +16,13 @@ import { DialogService } from 'app/modules/dialog/dialog.service';
 import { IxInputHarness } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.harness';
 import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness';
 import { PageHeaderComponent } from 'app/modules/page-header/page-title-header/page-header.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { AppWizardComponent } from 'app/pages/apps/components/app-wizard/app-wizard.component';
 import { DockerHubRateInfoDialogComponent } from 'app/pages/apps/components/dockerhub-rate-limit-info-dialog/dockerhub-rate-limit-info-dialog.component';
 import { ApplicationsService } from 'app/pages/apps/services/applications.service';
 import { DockerStore } from 'app/pages/apps/store/docker.store';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 const appVersion121 = {
   healthy: true,
@@ -270,6 +269,12 @@ describe('AppWizardComponent', () => {
     },
   } as App;
 
+  const slideInRef: SlideInRef<undefined, unknown> = {
+    close: jest.fn(),
+    requireConfirmationWhen: jest.fn(),
+    getData: jest.fn(() => undefined),
+  };
+
   const createComponent = createComponentFactory({
     component: AppWizardComponent,
     imports: [
@@ -281,7 +286,7 @@ describe('AppWizardComponent', () => {
       mockProvider(MatDialog),
     ],
     providers: [
-      mockProvider(OldSlideInService),
+      mockProvider(SlideIn),
       mockProvider(DialogService, {
         jobDialog: jest.fn(() => ({
           afterClosed: () => of({}),
@@ -308,10 +313,9 @@ describe('AppWizardComponent', () => {
       mockProvider(DockerStore, {
         selectedPool$: of('pool set'),
       }),
-      mockProvider(OldSlideInRef),
+      mockProvider(SlideInRef, slideInRef),
       mockProvider(Router),
       mockAuth(),
-      { provide: SLIDE_IN_DATA, useValue: undefined },
     ],
   });
 
diff --git a/src/app/pages/datasets/components/dataset-form/utils/dataset-form.service.spec.ts b/src/app/pages/datasets/components/dataset-form/utils/dataset-form.service.spec.ts
index fbeac6c8926..acec4e4b7b8 100644
--- a/src/app/pages/datasets/components/dataset-form/utils/dataset-form.service.spec.ts
+++ b/src/app/pages/datasets/components/dataset-form/utils/dataset-form.service.spec.ts
@@ -6,9 +6,9 @@ import { inherit } from 'app/enums/with-inherit.enum';
 import { helptextDatasetForm } from 'app/helptext/storage/volumes/datasets/dataset-form';
 import { Dataset } from 'app/interfaces/dataset.interface';
 import { DialogService } from 'app/modules/dialog/dialog.service';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { DatasetFormService } from 'app/pages/datasets/components/dataset-form/utils/dataset-form.service';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 describe('DatasetFormService', () => {
   let spectator: SpectatorService<DatasetFormService>;
@@ -22,7 +22,10 @@ describe('DatasetFormService', () => {
       mockProvider(DialogService, {
         warn: jest.fn(() => of(true)),
       }),
-      mockProvider(OldSlideInService),
+      mockProvider(SlideIn, {
+        components$: of([]),
+        closeLast: jest.fn(),
+      }),
     ],
   });
 
@@ -37,7 +40,7 @@ describe('DatasetFormService', () => {
         helptextDatasetForm.pathWarningTitle,
         helptextDatasetForm.pathIsTooLongWarning,
       );
-      expect(spectator.inject(OldSlideInService).closeLast).toHaveBeenCalled();
+      expect(spectator.inject(SlideIn).closeLast).toHaveBeenCalled();
     });
 
     it('checks parent path, shows error if it nesting level is too deep and closes slide in', async () => {
@@ -48,7 +51,7 @@ describe('DatasetFormService', () => {
         helptextDatasetForm.pathWarningTitle,
         helptextDatasetForm.pathIsTooDeepWarning,
       );
-      expect(spectator.inject(OldSlideInService).closeLast).toHaveBeenCalled();
+      expect(spectator.inject(SlideIn).closeLast).toHaveBeenCalled();
     });
   });
 
diff --git a/src/app/pages/datasets/components/dataset-form/utils/dataset-form.service.ts b/src/app/pages/datasets/components/dataset-form/utils/dataset-form.service.ts
index 49e5fcc7488..0cf624fd5d5 100644
--- a/src/app/pages/datasets/components/dataset-form/utils/dataset-form.service.ts
+++ b/src/app/pages/datasets/components/dataset-form/utils/dataset-form.service.ts
@@ -10,8 +10,8 @@ import { helptextDatasetForm } from 'app/helptext/storage/volumes/datasets/datas
 import { Dataset } from 'app/interfaces/dataset.interface';
 import { Option } from 'app/interfaces/option.interface';
 import { DialogService } from 'app/modules/dialog/dialog.service';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { ApiService } from 'app/modules/websocket/api.service';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 @Injectable({
   providedIn: 'root',
@@ -21,7 +21,7 @@ export class DatasetFormService {
     private dialog: DialogService,
     private api: ApiService,
     private translate: TranslateService,
-    private slideInService: OldSlideInService,
+    private slideIn: SlideIn,
   ) {}
 
   checkAndWarnForLengthAndDepth(path: string): Observable<boolean> {
@@ -35,7 +35,7 @@ export class DatasetFormService {
             this.translate.instant(helptextDatasetForm.pathWarningTitle),
             this.translate.instant(helptextDatasetForm.pathIsTooDeepWarning),
           ).pipe(
-            tap(() => this.slideInService.closeLast()),
+            tap(() => this.slideIn.closeLast()),
             map(() => false),
           );
         }
@@ -44,7 +44,7 @@ export class DatasetFormService {
             this.translate.instant(helptextDatasetForm.pathWarningTitle),
             this.translate.instant(helptextDatasetForm.pathIsTooLongWarning),
           ).pipe(
-            tap(() => this.slideInService.closeLast()),
+            tap(() => this.slideIn.closeLast()),
             map(() => false),
           );
         }
diff --git a/src/app/pages/datasets/components/zvol-form/zvol-form.component.spec.ts b/src/app/pages/datasets/components/zvol-form/zvol-form.component.spec.ts
index bfcb4a1aebb..f5052c2f57c 100644
--- a/src/app/pages/datasets/components/zvol-form/zvol-form.component.spec.ts
+++ b/src/app/pages/datasets/components/zvol-form/zvol-form.component.spec.ts
@@ -191,7 +191,6 @@ describe('ZvolFormComponent', () => {
       spectator = createComponent({
         providers: [
           mockProvider(SlideInRef, { ...slideInRef, getData: jest.fn(() => ({ isNew: false, parentId: 'test pool' })) }),
-
         ],
       });
       loader = TestbedHarnessEnvironment.loader(spectator.fixture);
diff --git a/src/app/pages/sharing/iscsi/authorized-access/authorized-access-form/authorized-access-form.component.html b/src/app/pages/sharing/iscsi/authorized-access/authorized-access-form/authorized-access-form.component.html
index cbe8e5d923c..2ad24fd2d76 100644
--- a/src/app/pages/sharing/iscsi/authorized-access/authorized-access-form/authorized-access-form.component.html
+++ b/src/app/pages/sharing/iscsi/authorized-access/authorized-access-form/authorized-access-form.component.html
@@ -1,4 +1,8 @@
-<ix-old-modal-header [requiredRoles]="requiredRoles" [title]="title" [loading]="isLoading"></ix-old-modal-header>
+<ix-modal-header
+  [requiredRoles]="requiredRoles"
+  [title]="title"
+  [loading]="isLoading"
+></ix-modal-header>
 
 <mat-card>
   <mat-card-content>
diff --git a/src/app/pages/sharing/iscsi/authorized-access/authorized-access-form/authorized-access-form.component.spec.ts b/src/app/pages/sharing/iscsi/authorized-access/authorized-access-form/authorized-access-form.component.spec.ts
index 82f10184aef..f54b2657d43 100644
--- a/src/app/pages/sharing/iscsi/authorized-access/authorized-access-form/authorized-access-form.component.spec.ts
+++ b/src/app/pages/sharing/iscsi/authorized-access/authorized-access-form/authorized-access-form.component.spec.ts
@@ -3,18 +3,18 @@ import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatButtonHarness } from '@angular/material/button/testing';
 import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest';
+import { of } from 'rxjs';
 import { mockCall, mockApi } from 'app/core/testing/utils/mock-api.utils';
 import { mockAuth } from 'app/core/testing/utils/mock-auth.utils';
 import { IscsiAuthAccess } from 'app/interfaces/iscsi.interface';
 import { DialogService } from 'app/modules/dialog/dialog.service';
 import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { ApiService } from 'app/modules/websocket/api.service';
 import {
   AuthorizedAccessFormComponent,
 } from 'app/pages/sharing/iscsi/authorized-access/authorized-access-form/authorized-access-form.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 describe('AuthorizedAccessFormComponent', () => {
   let spectator: Spectator<AuthorizedAccessFormComponent>;
@@ -30,6 +30,12 @@ describe('AuthorizedAccessFormComponent', () => {
     peersecret: 'peer123456789012',
   } as IscsiAuthAccess;
 
+  const slideInRef: SlideInRef<IscsiAuthAccess | undefined, unknown> = {
+    close: jest.fn(),
+    requireConfirmationWhen: jest.fn(),
+    getData: jest.fn(() => undefined),
+  };
+
   const createComponent = createComponentFactory({
     component: AuthorizedAccessFormComponent,
     imports: [
@@ -37,14 +43,15 @@ describe('AuthorizedAccessFormComponent', () => {
     ],
     providers: [
       mockAuth(),
-      mockProvider(OldSlideInService),
+      mockProvider(SlideIn, {
+        components$: of([]),
+      }),
       mockProvider(DialogService),
       mockApi([
         mockCall('iscsi.auth.create'),
         mockCall('iscsi.auth.update'),
       ]),
-      mockProvider(OldSlideInRef),
-      { provide: SLIDE_IN_DATA, useValue: undefined },
+      mockProvider(SlideInRef, slideInRef),
     ],
   });
 
@@ -77,7 +84,7 @@ describe('AuthorizedAccessFormComponent', () => {
         peersecret: 'peer123456789012',
         discovery_auth: 'NONE',
       }]);
-      expect(spectator.inject(OldSlideInRef).close).toHaveBeenCalled();
+      expect(spectator.inject(SlideInRef).close).toHaveBeenCalled();
     });
   });
 
@@ -85,7 +92,7 @@ describe('AuthorizedAccessFormComponent', () => {
     beforeEach(async () => {
       spectator = createComponent({
         providers: [
-          { provide: SLIDE_IN_DATA, useValue: existingAuthorizedAccess },
+          mockProvider(SlideInRef, { ...slideInRef, getData: () => existingAuthorizedAccess }),
         ],
       });
       loader = TestbedHarnessEnvironment.loader(spectator.fixture);
@@ -135,7 +142,7 @@ describe('AuthorizedAccessFormComponent', () => {
           },
         ],
       );
-      expect(spectator.inject(OldSlideInRef).close).toHaveBeenCalled();
+      expect(spectator.inject(SlideInRef).close).toHaveBeenCalled();
     });
   });
 });
diff --git a/src/app/pages/sharing/iscsi/authorized-access/authorized-access-form/authorized-access-form.component.ts b/src/app/pages/sharing/iscsi/authorized-access/authorized-access-form/authorized-access-form.component.ts
index 56a84a0d495..d1160d4953f 100644
--- a/src/app/pages/sharing/iscsi/authorized-access/authorized-access-form/authorized-access-form.component.ts
+++ b/src/app/pages/sharing/iscsi/authorized-access/authorized-access-form/authorized-access-form.component.ts
@@ -1,5 +1,5 @@
 import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, OnInit,
+  ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit,
 } from '@angular/core';
 import { FormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
 import { MatButton } from '@angular/material/button';
@@ -25,9 +25,8 @@ import {
   doesNotEqualFgValidator,
   matchOthersFgValidator,
 } from 'app/modules/forms/ix-forms/validators/password-validation/password-validation';
-import { OldModalHeaderComponent } from 'app/modules/slide-ins/components/old-modal-header/old-modal-header.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { ModalHeaderComponent } from 'app/modules/slide-ins/components/modal-header/modal-header.component';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
 
@@ -38,7 +37,7 @@ import { ApiService } from 'app/modules/websocket/api.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    OldModalHeaderComponent,
+    ModalHeaderComponent,
     MatCard,
     MatCardContent,
     ReactiveFormsModule,
@@ -105,6 +104,7 @@ export class AuthorizedAccessFormComponent implements OnInit {
 
   isLoading = false;
   discoveryAuthOptions$: Observable<Option<IscsiAuthMethod>[]>;
+  protected editingAccess: IscsiAuthAccess | undefined;
 
   readonly defaultDiscoveryAuthOptions = [
     {
@@ -139,9 +139,10 @@ export class AuthorizedAccessFormComponent implements OnInit {
     private cdr: ChangeDetectorRef,
     private api: ApiService,
     private validatorService: IxValidatorsService,
-    private slideInRef: OldSlideInRef<AuthorizedAccessFormComponent>,
-    @Inject(SLIDE_IN_DATA) private editingAccess: IscsiAuthAccess,
-  ) {}
+    public slideInRef: SlideInRef<IscsiAuthAccess | undefined, boolean>,
+  ) {
+    this.editingAccess = this.slideInRef.getData();
+  }
 
   ngOnInit(): void {
     this.discoveryAuthOptions$ = of(this.defaultDiscoveryAuthOptions);
@@ -205,7 +206,7 @@ export class AuthorizedAccessFormComponent implements OnInit {
     request$.pipe(untilDestroyed(this)).subscribe({
       next: () => {
         this.isLoading = false;
-        this.slideInRef.close(true);
+        this.slideInRef.close({ response: true, error: null });
       },
       error: (error: unknown) => {
         this.isLoading = false;
diff --git a/src/app/pages/sharing/iscsi/authorized-access/authorized-access-list/authorized-access-list.component.spec.ts b/src/app/pages/sharing/iscsi/authorized-access/authorized-access-list/authorized-access-list.component.spec.ts
index 891622c23ce..a3e9d37c4ae 100644
--- a/src/app/pages/sharing/iscsi/authorized-access/authorized-access-list/authorized-access-list.component.spec.ts
+++ b/src/app/pages/sharing/iscsi/authorized-access/authorized-access-list/authorized-access-list.component.spec.ts
@@ -16,11 +16,11 @@ import {
   IxTableColumnsSelectorComponent,
 } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component';
 import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { AuthorizedAccessFormComponent } from 'app/pages/sharing/iscsi/authorized-access/authorized-access-form/authorized-access-form.component';
 import { AuthorizedAccessListComponent } from 'app/pages/sharing/iscsi/authorized-access/authorized-access-list/authorized-access-list.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 const authAccess: IscsiAuthAccess[] = [
   {
@@ -36,6 +36,12 @@ describe('AuthorizedAccessListComponent', () => {
   let loader: HarnessLoader;
   let table: IxTableHarness;
 
+  const slideInRef: SlideInRef<undefined, unknown> = {
+    close: jest.fn(),
+    requireConfirmationWhen: jest.fn(),
+    getData: jest.fn(() => undefined),
+  };
+
   const createComponent = createComponentFactory({
     component: AuthorizedAccessListComponent,
     imports: [
@@ -50,12 +56,12 @@ describe('AuthorizedAccessListComponent', () => {
         mockCall('iscsi.auth.query', authAccess),
         mockCall('iscsi.auth.delete'),
       ]),
-      mockProvider(OldSlideInRef),
+      mockProvider(SlideInRef, slideInRef),
       mockProvider(DialogService, {
         confirm: jest.fn(() => of(true)),
       }),
-      mockProvider(OldSlideInService, {
-        open: jest.fn(() => ({ slideInClosed$: of(true) })),
+      mockProvider(SlideIn, {
+        open: jest.fn(() => of()),
       }),
       mockProvider(MatDialog, {
         open: jest.fn(),
@@ -78,14 +84,14 @@ describe('AuthorizedAccessListComponent', () => {
     const addButton = await loader.getHarness(MatButtonHarness.with({ text: 'Add' }));
     await addButton.click();
 
-    expect(spectator.inject(OldSlideInService).open).toHaveBeenCalledWith(AuthorizedAccessFormComponent);
+    expect(spectator.inject(SlideIn).open).toHaveBeenCalledWith(AuthorizedAccessFormComponent);
   });
 
   it('opens authorized access form when "Edit" button is pressed', async () => {
     const editButton = await table.getHarnessInCell(IxIconHarness.with({ name: 'edit' }), 1, 3);
     await editButton.click();
 
-    expect(spectator.inject(OldSlideInService).open).toHaveBeenCalledWith(AuthorizedAccessFormComponent, {
+    expect(spectator.inject(SlideIn).open).toHaveBeenCalledWith(AuthorizedAccessFormComponent, {
       data: authAccess[0],
     });
   });
diff --git a/src/app/pages/sharing/iscsi/authorized-access/authorized-access-list/authorized-access-list.component.ts b/src/app/pages/sharing/iscsi/authorized-access/authorized-access-list/authorized-access-list.component.ts
index dc42ac38413..38a676d1dd2 100644
--- a/src/app/pages/sharing/iscsi/authorized-access/authorized-access-list/authorized-access-list.component.ts
+++ b/src/app/pages/sharing/iscsi/authorized-access/authorized-access-list/authorized-access-list.component.ts
@@ -30,6 +30,7 @@ import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-
 import { createTable } from 'app/modules/ix-table/utils';
 import { AppLoaderService } from 'app/modules/loader/app-loader.service';
 import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { AuthorizedAccessFormComponent } from 'app/pages/sharing/iscsi/authorized-access/authorized-access-form/authorized-access-form.component';
@@ -38,7 +39,6 @@ import {
 } from 'app/pages/sharing/iscsi/authorized-access/authorized-access-list/authorized-access-list.elements';
 import { ErrorHandlerService } from 'app/services/error-handler.service';
 import { IscsiService } from 'app/services/iscsi.service';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 @UntilDestroy()
 @Component({
@@ -100,10 +100,11 @@ export class AuthorizedAccessListComponent implements OnInit {
           iconName: iconMarker('edit'),
           tooltip: this.translate.instant('Edit'),
           onClick: (row) => {
-            const slideInRef = this.slideInService.open(AuthorizedAccessFormComponent, { data: row });
-            slideInRef.slideInClosed$
-              .pipe(filter(Boolean), untilDestroyed(this))
-              .subscribe(() => this.refresh());
+            this.slideIn.open(AuthorizedAccessFormComponent, { data: row })
+              .pipe(
+                filter((response) => !!response.response),
+                untilDestroyed(this),
+              ).subscribe(() => this.refresh());
           },
         },
         {
@@ -140,7 +141,7 @@ export class AuthorizedAccessListComponent implements OnInit {
     private dialogService: DialogService,
     private api: ApiService,
     private translate: TranslateService,
-    private slideInService: OldSlideInService,
+    private slideIn: SlideIn,
     private errorHandler: ErrorHandlerService,
     private cdr: ChangeDetectorRef,
     private iscsiService: IscsiService,
@@ -161,8 +162,10 @@ export class AuthorizedAccessListComponent implements OnInit {
   }
 
   doAdd(): void {
-    const slideInRef = this.slideInService.open(AuthorizedAccessFormComponent);
-    slideInRef.slideInClosed$.pipe(filter(Boolean), untilDestroyed(this)).subscribe(() => this.refresh());
+    this.slideIn.open(AuthorizedAccessFormComponent).pipe(
+      filter((response) => !!response.response),
+      untilDestroyed(this),
+    ).subscribe(() => this.refresh());
   }
 
   onListFiltered(query: string): void {
diff --git a/src/app/pages/sharing/iscsi/extent/extent-form/extent-form.component.html b/src/app/pages/sharing/iscsi/extent/extent-form/extent-form.component.html
index 2aef200cc8a..82d59a8149b 100644
--- a/src/app/pages/sharing/iscsi/extent/extent-form/extent-form.component.html
+++ b/src/app/pages/sharing/iscsi/extent/extent-form/extent-form.component.html
@@ -1,4 +1,8 @@
-<ix-old-modal-header [requiredRoles]="requiredRoles" [title]="title" [loading]="isLoading"></ix-old-modal-header>
+<ix-modal-header
+  [requiredRoles]="requiredRoles"
+  [title]="title"
+  [loading]="isLoading"
+></ix-modal-header>
 
 <mat-card>
   <mat-card-content>
diff --git a/src/app/pages/sharing/iscsi/extent/extent-form/extent-form.component.spec.ts b/src/app/pages/sharing/iscsi/extent/extent-form/extent-form.component.spec.ts
index 51ee7b876d6..df5c6c6ad1d 100644
--- a/src/app/pages/sharing/iscsi/extent/extent-form/extent-form.component.spec.ts
+++ b/src/app/pages/sharing/iscsi/extent/extent-form/extent-form.component.spec.ts
@@ -3,6 +3,7 @@ import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatButtonHarness } from '@angular/material/button/testing';
 import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest';
+import { of } from 'rxjs';
 import { KiB } from 'app/constants/bytes.constant';
 import { mockCall, mockApi } from 'app/core/testing/utils/mock-api.utils';
 import { mockAuth } from 'app/core/testing/utils/mock-auth.utils';
@@ -11,11 +12,10 @@ import { Choices } from 'app/interfaces/choices.interface';
 import { IscsiExtent } from 'app/interfaces/iscsi.interface';
 import { DialogService } from 'app/modules/dialog/dialog.service';
 import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { ExtentFormComponent } from 'app/pages/sharing/iscsi/extent/extent-form/extent-form.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 import { StorageService } from 'app/services/storage.service';
 
 describe('ExtentFormComponent', () => {
@@ -23,6 +23,12 @@ describe('ExtentFormComponent', () => {
   let loader: HarnessLoader;
   let form: IxFormHarness;
 
+  const slideInRef: SlideInRef<undefined, unknown> = {
+    close: jest.fn(),
+    requireConfirmationWhen: jest.fn(),
+    getData: jest.fn(() => undefined),
+  };
+
   const existingExtent = {
     id: 123,
     name: 'test_name',
@@ -49,7 +55,9 @@ describe('ExtentFormComponent', () => {
     ],
     providers: [
       mockAuth(),
-      mockProvider(OldSlideInService),
+      mockProvider(SlideIn, {
+        components$: of([]),
+      }),
       mockProvider(StorageService),
       mockProvider(DialogService),
       mockApi([
@@ -61,8 +69,7 @@ describe('ExtentFormComponent', () => {
           key_device_3: 'value_device_3',
         } as Choices),
       ]),
-      mockProvider(OldSlideInRef),
-      { provide: SLIDE_IN_DATA, useValue: undefined },
+      mockProvider(SlideInRef, slideInRef),
     ],
   });
 
@@ -124,7 +131,7 @@ describe('ExtentFormComponent', () => {
         type: IscsiExtentType.Disk,
         xen: true,
       }]);
-      expect(spectator.inject(OldSlideInRef).close).toHaveBeenCalled();
+      expect(spectator.inject(SlideInRef).close).toHaveBeenCalled();
     });
   });
 
@@ -132,7 +139,7 @@ describe('ExtentFormComponent', () => {
     beforeEach(async () => {
       spectator = createComponent({
         providers: [
-          { provide: SLIDE_IN_DATA, useValue: existingExtent },
+          mockProvider(SlideInRef, { ...slideInRef, getData: () => existingExtent }),
         ],
       });
       loader = TestbedHarnessEnvironment.loader(spectator.fixture);
@@ -188,7 +195,7 @@ describe('ExtentFormComponent', () => {
           xen: true,
         },
       ]);
-      expect(spectator.inject(OldSlideInRef).close).toHaveBeenCalled();
+      expect(spectator.inject(SlideInRef).close).toHaveBeenCalled();
     });
   });
 });
diff --git a/src/app/pages/sharing/iscsi/extent/extent-form/extent-form.component.ts b/src/app/pages/sharing/iscsi/extent/extent-form/extent-form.component.ts
index 81d2d735d2e..cebe94acbe0 100644
--- a/src/app/pages/sharing/iscsi/extent/extent-form/extent-form.component.ts
+++ b/src/app/pages/sharing/iscsi/extent/extent-form/extent-form.component.ts
@@ -1,5 +1,5 @@
 import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, OnInit,
+  ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit,
 } from '@angular/core';
 import { Validators, ReactiveFormsModule } from '@angular/forms';
 import { MatButton } from '@angular/material/button';
@@ -28,9 +28,8 @@ import { IxInputComponent } from 'app/modules/forms/ix-forms/components/ix-input
 import { IxSelectComponent } from 'app/modules/forms/ix-forms/components/ix-select/ix-select.component';
 import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service';
 import { IxFormatterService } from 'app/modules/forms/ix-forms/services/ix-formatter.service';
-import { OldModalHeaderComponent } from 'app/modules/slide-ins/components/old-modal-header/old-modal-header.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { ModalHeaderComponent } from 'app/modules/slide-ins/components/modal-header/modal-header.component';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { FilesystemService } from 'app/services/filesystem.service';
@@ -44,7 +43,7 @@ import { IscsiService } from 'app/services/iscsi.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    OldModalHeaderComponent,
+    ModalHeaderComponent,
     MatCard,
     MatCardContent,
     ReactiveFormsModule,
@@ -98,6 +97,7 @@ export class ExtentFormComponent implements OnInit {
   });
 
   isLoading = false;
+  protected editingExtent: IscsiExtent | undefined;
 
   private extentDiskBeingEdited$ = new BehaviorSubject<Option>(undefined);
 
@@ -137,9 +137,10 @@ export class ExtentFormComponent implements OnInit {
     private cdr: ChangeDetectorRef,
     private api: ApiService,
     private filesystemService: FilesystemService,
-    private slideInRef: OldSlideInRef<ExtentFormComponent>,
-    @Inject(SLIDE_IN_DATA) private editingExtent: IscsiExtent,
-  ) {}
+    public slideInRef: SlideInRef<IscsiExtent | undefined, boolean>,
+  ) {
+    this.editingExtent = this.slideInRef.getData();
+  }
 
   ngOnInit(): void {
     this.form.controls.type.valueChanges.pipe(untilDestroyed(this)).subscribe((value: IscsiExtentType) => {
@@ -195,7 +196,7 @@ export class ExtentFormComponent implements OnInit {
     request$.pipe(untilDestroyed(this)).subscribe({
       next: () => {
         this.isLoading = false;
-        this.slideInRef.close(true);
+        this.slideInRef.close({ response: true, error: null });
       },
       error: (error: unknown) => {
         this.isLoading = false;
diff --git a/src/app/pages/sharing/iscsi/extent/extent-list/extent-list.component.spec.ts b/src/app/pages/sharing/iscsi/extent/extent-list/extent-list.component.spec.ts
index 0df7c8c2e06..d8fe53bd7ad 100644
--- a/src/app/pages/sharing/iscsi/extent/extent-list/extent-list.component.spec.ts
+++ b/src/app/pages/sharing/iscsi/extent/extent-list/extent-list.component.spec.ts
@@ -16,11 +16,11 @@ import {
   IxTableColumnsSelectorComponent,
 } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component';
 import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { ExtentFormComponent } from 'app/pages/sharing/iscsi/extent/extent-form/extent-form.component';
 import { DeleteExtentDialogComponent } from 'app/pages/sharing/iscsi/extent/extent-list/delete-extent-dialog/delete-extent-dialog.component';
 import { ExtentListComponent } from 'app/pages/sharing/iscsi/extent/extent-list/extent-list.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 const extents: IscsiExtent[] = [
   {
@@ -39,6 +39,12 @@ describe('ExtentListComponent', () => {
   let loader: HarnessLoader;
   let table: IxTableHarness;
 
+  const slideInRef: SlideInRef<undefined, unknown> = {
+    close: jest.fn(),
+    requireConfirmationWhen: jest.fn(),
+    getData: jest.fn(() => undefined),
+  };
+
   const createComponent = createComponentFactory({
     component: ExtentListComponent,
     imports: [
@@ -52,12 +58,12 @@ describe('ExtentListComponent', () => {
         mockCall('iscsi.extent.query', extents),
         mockCall('iscsi.extent.delete'),
       ]),
-      mockProvider(OldSlideInRef),
+      mockProvider(SlideInRef, slideInRef),
       mockProvider(DialogService, {
         confirm: jest.fn(() => of(true)),
       }),
-      mockProvider(OldSlideInService, {
-        open: jest.fn(() => ({ slideInClosed$: of(true) })),
+      mockProvider(SlideIn, {
+        open: jest.fn(() => of()),
       }),
       mockProvider(MatDialog, {
         open: jest.fn(() => ({
@@ -83,14 +89,14 @@ describe('ExtentListComponent', () => {
     const addButton = await loader.getHarness(MatButtonHarness.with({ text: 'Add' }));
     await addButton.click();
 
-    expect(spectator.inject(OldSlideInService).open).toHaveBeenCalledWith(ExtentFormComponent, { wide: true });
+    expect(spectator.inject(SlideIn).open).toHaveBeenCalledWith(ExtentFormComponent, { wide: true });
   });
 
   it('opens extent form when "Edit" button is pressed', async () => {
     const editButton = await table.getHarnessInCell(IxIconHarness.with({ name: 'edit' }), 1, 6);
     await editButton.click();
 
-    expect(spectator.inject(OldSlideInService).open).toHaveBeenCalledWith(ExtentFormComponent, {
+    expect(spectator.inject(SlideIn).open).toHaveBeenCalledWith(ExtentFormComponent, {
       data: extents[0],
       wide: true,
     });
diff --git a/src/app/pages/sharing/iscsi/extent/extent-list/extent-list.component.ts b/src/app/pages/sharing/iscsi/extent/extent-list/extent-list.component.ts
index 567ad354647..aa0ed444c3e 100644
--- a/src/app/pages/sharing/iscsi/extent/extent-list/extent-list.component.ts
+++ b/src/app/pages/sharing/iscsi/extent/extent-list/extent-list.component.ts
@@ -29,6 +29,7 @@ import { IxTablePagerComponent } from 'app/modules/ix-table/components/ix-table-
 import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive';
 import { createTable } from 'app/modules/ix-table/utils';
 import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ExtentFormComponent } from 'app/pages/sharing/iscsi/extent/extent-form/extent-form.component';
 import {
@@ -36,7 +37,6 @@ import {
 } from 'app/pages/sharing/iscsi/extent/extent-list/delete-extent-dialog/delete-extent-dialog.component';
 import { extentListElements } from 'app/pages/sharing/iscsi/extent/extent-list/extent-list.elements';
 import { IscsiService } from 'app/services/iscsi.service';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 @UntilDestroy()
 @Component({
@@ -113,10 +113,10 @@ export class ExtentListComponent implements OnInit {
           iconName: iconMarker('edit'),
           tooltip: this.translate.instant('Edit'),
           onClick: (extent) => {
-            const slideInRef = this.slideInService.open(ExtentFormComponent, { wide: true, data: extent });
-            slideInRef.slideInClosed$
-              .pipe(filter(Boolean), untilDestroyed(this))
-              .subscribe(() => this.refresh());
+            this.slideIn.open(ExtentFormComponent, { wide: true, data: extent }).pipe(
+              filter((response) => !!response.response),
+              untilDestroyed(this),
+            ).subscribe(() => this.refresh());
           },
         },
         {
@@ -134,7 +134,7 @@ export class ExtentListComponent implements OnInit {
 
   constructor(
     public emptyService: EmptyService,
-    private slideInService: OldSlideInService,
+    private slideIn: SlideIn,
     private translate: TranslateService,
     private matDialog: MatDialog,
     private cdr: ChangeDetectorRef,
@@ -155,10 +155,10 @@ export class ExtentListComponent implements OnInit {
   }
 
   doAdd(): void {
-    const slideInRef = this.slideInService.open(ExtentFormComponent, { wide: true });
-    slideInRef.slideInClosed$
-      .pipe(filter(Boolean), untilDestroyed(this))
-      .subscribe(() => this.refresh());
+    this.slideIn.open(ExtentFormComponent, { wide: true }).pipe(
+      filter((response) => !!response.response),
+      untilDestroyed(this),
+    ).subscribe(() => this.refresh());
   }
 
   showDeleteDialog(extent: IscsiExtent): void {
diff --git a/src/app/pages/sharing/iscsi/portal/portal-form/portal-form.component.html b/src/app/pages/sharing/iscsi/portal/portal-form/portal-form.component.html
index ff2456acc4f..e2582bef001 100644
--- a/src/app/pages/sharing/iscsi/portal/portal-form/portal-form.component.html
+++ b/src/app/pages/sharing/iscsi/portal/portal-form/portal-form.component.html
@@ -1,8 +1,8 @@
-<ix-old-modal-header
+<ix-modal-header
   [requiredRoles]="requiredRoles"
   [title]="title | translate"
   [loading]="isLoading"
-></ix-old-modal-header>
+></ix-modal-header>
 
 <mat-card>
   <mat-card-content>
@@ -24,8 +24,8 @@
           (add)="onAdd()"
         >
           @for (item of listen; track item; let i = $index) {
-            <ix-list-item 
-              [label]="'IP Address' | translate" 
+            <ix-list-item
+              [label]="'IP Address' | translate"
               (delete)="onDelete(i)"
             >
               <ix-select
diff --git a/src/app/pages/sharing/iscsi/portal/portal-form/portal-form.component.spec.ts b/src/app/pages/sharing/iscsi/portal/portal-form/portal-form.component.spec.ts
index bd59626e856..73f3d55aac9 100644
--- a/src/app/pages/sharing/iscsi/portal/portal-form/portal-form.component.spec.ts
+++ b/src/app/pages/sharing/iscsi/portal/portal-form/portal-form.component.spec.ts
@@ -4,22 +4,36 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { MatButtonHarness } from '@angular/material/button/testing';
 import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest';
 import { provideMockStore } from '@ngrx/store/testing';
+import { of } from 'rxjs';
 import { mockCall, mockApi } from 'app/core/testing/utils/mock-api.utils';
 import { mockAuth } from 'app/core/testing/utils/mock-auth.utils';
 import { IscsiAuthMethod } from 'app/enums/iscsi.enum';
 import { IscsiPortal } from 'app/interfaces/iscsi.interface';
 import { DialogService } from 'app/modules/dialog/dialog.service';
 import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { ApiService } from 'app/modules/websocket/api.service';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 import { PortalFormComponent } from './portal-form.component';
 
 describe('PortalFormComponent', () => {
   let spectator: Spectator<PortalFormComponent>;
   let loader: HarnessLoader;
   let api: ApiService;
+
+  const slideInRef: SlideInRef<IscsiPortal | undefined, unknown> = {
+    close: jest.fn(),
+    requireConfirmationWhen: jest.fn(),
+    getData: jest.fn(() => undefined),
+  };
+
+  const editingPortal = {
+    comment: 'test',
+    listen: [{ ip: '0.0.0.0' }],
+    id: 1,
+    tag: 1,
+  } as IscsiPortal;
+
   const createComponent = createComponentFactory({
     component: PortalFormComponent,
     imports: [
@@ -44,11 +58,12 @@ describe('PortalFormComponent', () => {
         mockCall('iscsi.portal.create'),
         mockCall('iscsi.portal.update'),
       ]),
-      mockProvider(OldSlideInService),
+      mockProvider(SlideIn, {
+        components$: of([]),
+      }),
       mockProvider(DialogService),
       provideMockStore(),
-      mockProvider(OldSlideInRef),
-      { provide: SLIDE_IN_DATA, useValue: undefined },
+      mockProvider(SlideInRef, slideInRef),
     ],
   });
 
@@ -85,15 +100,7 @@ describe('PortalFormComponent', () => {
     beforeEach(() => {
       spectator = createComponent({
         providers: [
-          {
-            provide: SLIDE_IN_DATA,
-            useValue: {
-              comment: 'test',
-              listen: [{ ip: '0.0.0.0' }],
-              id: 1,
-              tag: 1,
-            } as IscsiPortal,
-          },
+          mockProvider(SlideInRef, { ...slideInRef, getData: () => editingPortal }),
         ],
       });
       loader = TestbedHarnessEnvironment.loader(spectator.fixture);
diff --git a/src/app/pages/sharing/iscsi/portal/portal-form/portal-form.component.ts b/src/app/pages/sharing/iscsi/portal/portal-form/portal-form.component.ts
index e597b07dbca..de89f421469 100644
--- a/src/app/pages/sharing/iscsi/portal/portal-form/portal-form.component.ts
+++ b/src/app/pages/sharing/iscsi/portal/portal-form/portal-form.component.ts
@@ -1,6 +1,6 @@
 import {
   ChangeDetectionStrategy,
-  ChangeDetectorRef, Component, Inject, OnInit,
+  ChangeDetectorRef, Component, OnInit,
 } from '@angular/core';
 import { Validators, ReactiveFormsModule } from '@angular/forms';
 import { MatButton } from '@angular/material/button';
@@ -22,9 +22,8 @@ import { IxListComponent } from 'app/modules/forms/ix-forms/components/ix-list/i
 import { IxSelectComponent } from 'app/modules/forms/ix-forms/components/ix-select/ix-select.component';
 import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service';
 import { ipValidator } from 'app/modules/forms/ix-forms/validators/ip-validation';
-import { OldModalHeaderComponent } from 'app/modules/slide-ins/components/old-modal-header/old-modal-header.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { ModalHeaderComponent } from 'app/modules/slide-ins/components/modal-header/modal-header.component';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { IscsiService } from 'app/services/iscsi.service';
@@ -37,7 +36,7 @@ import { IscsiService } from 'app/services/iscsi.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    OldModalHeaderComponent,
+    ModalHeaderComponent,
     MatCard,
     MatCardContent,
     ReactiveFormsModule,
@@ -86,6 +85,8 @@ export class PortalFormComponent implements OnInit {
 
   readonly listenOptions$ = this.iscsiService.getIpChoices().pipe(choicesToOptions());
 
+  protected editingIscsiPortal: IscsiPortal | undefined;
+
   readonly requiredRoles = [
     Role.SharingIscsiPortalWrite,
     Role.SharingIscsiWrite,
@@ -99,9 +100,10 @@ export class PortalFormComponent implements OnInit {
     private cdr: ChangeDetectorRef,
     private errorHandler: FormErrorHandlerService,
     protected iscsiService: IscsiService,
-    private slideInRef: OldSlideInRef<PortalFormComponent>,
-    @Inject(SLIDE_IN_DATA) private editingIscsiPortal: IscsiPortal,
-  ) {}
+    public slideInRef: SlideInRef<IscsiPortal | undefined, boolean>,
+  ) {
+    this.editingIscsiPortal = this.slideInRef.getData();
+  }
 
   ngOnInit(): void {
     if (this.editingIscsiPortal) {
@@ -152,7 +154,7 @@ export class PortalFormComponent implements OnInit {
       next: () => {
         this.isLoading = false;
         this.cdr.markForCheck();
-        this.slideInRef.close(true);
+        this.slideInRef.close({ response: true, error: null });
       },
       error: (error: unknown) => {
         this.isLoading = false;
diff --git a/src/app/pages/sharing/iscsi/portal/portal-list/portal-list.component.spec.ts b/src/app/pages/sharing/iscsi/portal/portal-list/portal-list.component.spec.ts
index c037e35b658..22f441d9291 100644
--- a/src/app/pages/sharing/iscsi/portal/portal-list/portal-list.component.spec.ts
+++ b/src/app/pages/sharing/iscsi/portal/portal-list/portal-list.component.spec.ts
@@ -18,11 +18,11 @@ import {
   IxTableColumnsSelectorComponent,
 } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component';
 import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { PortalFormComponent } from 'app/pages/sharing/iscsi/portal/portal-form/portal-form.component';
 import { PortalListComponent } from 'app/pages/sharing/iscsi/portal/portal-list/portal-list.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 const portals: IscsiPortal[] = [
   {
@@ -43,6 +43,12 @@ describe('PortalListComponent', () => {
   let loader: HarnessLoader;
   let table: IxTableHarness;
 
+  const slideInRef: SlideInRef<undefined, unknown> = {
+    close: jest.fn(),
+    requireConfirmationWhen: jest.fn(),
+    getData: jest.fn(() => undefined),
+  };
+
   const createComponent = createRoutingFactory({
     component: PortalListComponent,
     imports: [
@@ -57,12 +63,12 @@ describe('PortalListComponent', () => {
         mockCall('iscsi.portal.delete'),
         mockCall('iscsi.portal.listen_ip_choices', { '0.0.0.0': '0.0.0.0' } as Choices),
       ]),
-      mockProvider(OldSlideInRef),
+      mockProvider(SlideInRef, slideInRef),
       mockProvider(DialogService, {
         confirm: jest.fn(() => of(true)),
       }),
-      mockProvider(OldSlideInService, {
-        open: jest.fn(() => ({ slideInClosed$: of(true) })),
+      mockProvider(SlideIn, {
+        open: jest.fn(() => of()),
       }),
       mockProvider(MatDialog, {
         open: jest.fn(),
@@ -86,14 +92,14 @@ describe('PortalListComponent', () => {
     const addButton = await loader.getHarness(MatButtonHarness.with({ text: 'Add' }));
     await addButton.click();
 
-    expect(spectator.inject(OldSlideInService).open).toHaveBeenCalledWith(PortalFormComponent);
+    expect(spectator.inject(SlideIn).open).toHaveBeenCalledWith(PortalFormComponent);
   });
 
   it('opens portal form when "Edit" button is pressed', async () => {
     const editButton = await table.getHarnessInCell(IxIconHarness.with({ name: 'edit' }), 1, 3);
     await editButton.click();
 
-    expect(spectator.inject(OldSlideInService).open).toHaveBeenCalledWith(PortalFormComponent, {
+    expect(spectator.inject(SlideIn).open).toHaveBeenCalledWith(PortalFormComponent, {
       data: portals[0],
     });
   });
diff --git a/src/app/pages/sharing/iscsi/portal/portal-list/portal-list.component.ts b/src/app/pages/sharing/iscsi/portal/portal-list/portal-list.component.ts
index 1a14fa91dc0..2561a04dd9f 100644
--- a/src/app/pages/sharing/iscsi/portal/portal-list/portal-list.component.ts
+++ b/src/app/pages/sharing/iscsi/portal/portal-list/portal-list.component.ts
@@ -30,13 +30,13 @@ import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-
 import { createTable } from 'app/modules/ix-table/utils';
 import { AppLoaderService } from 'app/modules/loader/app-loader.service';
 import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { PortalFormComponent } from 'app/pages/sharing/iscsi/portal/portal-form/portal-form.component';
 import { portalListElements } from 'app/pages/sharing/iscsi/portal/portal-list/portal-list.elements';
 import { ErrorHandlerService } from 'app/services/error-handler.service';
 import { IscsiService } from 'app/services/iscsi.service';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 @UntilDestroy()
 @Component({
@@ -105,10 +105,10 @@ export class PortalListComponent implements OnInit {
           iconName: iconMarker('edit'),
           tooltip: this.translate.instant('Edit'),
           onClick: (row) => {
-            const slideInRef = this.slideInService.open(PortalFormComponent, { data: row });
-            slideInRef.slideInClosed$
-              .pipe(filter(Boolean), untilDestroyed(this))
-              .subscribe(() => this.refresh());
+            this.slideIn.open(PortalFormComponent, { data: row }).pipe(
+              filter((response) => !!response.response),
+              untilDestroyed(this),
+            ).subscribe(() => this.refresh());
           },
         },
         {
@@ -145,7 +145,7 @@ export class PortalListComponent implements OnInit {
     private dialogService: DialogService,
     private api: ApiService,
     private translate: TranslateService,
-    private slideInService: OldSlideInService,
+    private slideIn: SlideIn,
     private errorHandler: ErrorHandlerService,
     private cdr: ChangeDetectorRef,
     private iscsiService: IscsiService,
@@ -168,8 +168,10 @@ export class PortalListComponent implements OnInit {
   }
 
   doAdd(): void {
-    const slideInRef = this.slideInService.open(PortalFormComponent);
-    slideInRef.slideInClosed$.pipe(filter(Boolean), untilDestroyed(this)).subscribe(() => this.refresh());
+    this.slideIn.open(PortalFormComponent).pipe(
+      filter((response) => !!response.response),
+      untilDestroyed(this),
+    ).subscribe(() => this.refresh());
   }
 
   onListFiltered(query: string): void {
diff --git a/src/app/pages/storage/components/import-pool/import-pool.component.html b/src/app/pages/storage/components/import-pool/import-pool.component.html
index 22510182960..1a48ed9df2c 100644
--- a/src/app/pages/storage/components/import-pool/import-pool.component.html
+++ b/src/app/pages/storage/components/import-pool/import-pool.component.html
@@ -1,8 +1,8 @@
-<ix-old-modal-header
+<ix-modal-header
   [requiredRoles]="requiredRoles"
   [title]="helptext.import_title | translate"
   [loading]="isLoading"
-></ix-old-modal-header>
+></ix-modal-header>
 <mat-card>
   <mat-card-content>
     <form
diff --git a/src/app/pages/storage/components/import-pool/import-pool.component.spec.ts b/src/app/pages/storage/components/import-pool/import-pool.component.spec.ts
index 3a7c7d1530a..1d070e2d851 100644
--- a/src/app/pages/storage/components/import-pool/import-pool.component.spec.ts
+++ b/src/app/pages/storage/components/import-pool/import-pool.component.spec.ts
@@ -14,7 +14,7 @@ import { PoolFindResult } from 'app/interfaces/pool-import.interface';
 import { DialogService } from 'app/modules/dialog/dialog.service';
 import { IxSelectHarness } from 'app/modules/forms/ix-forms/components/ix-select/ix-select.harness';
 import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { ImportPoolComponent } from './import-pool.component';
 
@@ -23,6 +23,12 @@ describe('ImportPoolComponent', () => {
   let loader: HarnessLoader;
   let api: ApiService;
 
+  const slideInRef: SlideInRef<undefined, unknown> = {
+    close: jest.fn(),
+    requireConfirmationWhen: jest.fn(),
+    getData: jest.fn(() => undefined),
+  };
+
   const createComponent = createComponentFactory({
     component: ImportPoolComponent,
     imports: [
@@ -56,7 +62,7 @@ describe('ImportPoolComponent', () => {
           encryption_root: '/mnt/pewl',
         } as Dataset]),
       ]),
-      mockProvider(OldSlideInRef),
+      mockProvider(SlideInRef, slideInRef),
       mockProvider(DialogService, {
         confirm: jest.fn(() => of(true)),
         jobDialog: jest.fn(() => ({
diff --git a/src/app/pages/storage/components/import-pool/import-pool.component.ts b/src/app/pages/storage/components/import-pool/import-pool.component.ts
index 21911516d3e..114fd0b773f 100644
--- a/src/app/pages/storage/components/import-pool/import-pool.component.ts
+++ b/src/app/pages/storage/components/import-pool/import-pool.component.ts
@@ -24,8 +24,8 @@ import { FormActionsComponent } from 'app/modules/forms/ix-forms/components/form
 import { IxFieldsetComponent } from 'app/modules/forms/ix-forms/components/ix-fieldset/ix-fieldset.component';
 import { IxSelectComponent } from 'app/modules/forms/ix-forms/components/ix-select/ix-select.component';
 import { AppLoaderService } from 'app/modules/loader/app-loader.service';
-import { OldModalHeaderComponent } from 'app/modules/slide-ins/components/old-modal-header/old-modal-header.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
+import { ModalHeaderComponent } from 'app/modules/slide-ins/components/modal-header/modal-header.component';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
@@ -38,7 +38,7 @@ import { ErrorHandlerService } from 'app/services/error-handler.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    OldModalHeaderComponent,
+    ModalHeaderComponent,
     MatCard,
     MatCardContent,
     ReactiveFormsModule,
@@ -74,7 +74,6 @@ export class ImportPoolComponent implements OnInit {
 
   constructor(
     private fb: FormBuilder,
-    private slideInRef: OldSlideInRef<ImportPoolComponent>,
     private api: ApiService,
     private errorHandler: ErrorHandlerService,
     private dialogService: DialogService,
@@ -83,6 +82,7 @@ export class ImportPoolComponent implements OnInit {
     private router: Router,
     private snackbar: SnackbarService,
     private loader: AppLoaderService,
+    public slideInRef: SlideInRef<undefined, boolean>,
   ) { }
 
   ngOnInit(): void {
@@ -127,7 +127,7 @@ export class ImportPoolComponent implements OnInit {
         untilDestroyed(this),
       )
       .subscribe(([datasets, shouldTryUnlocking]) => {
-        this.slideInRef.close(true);
+        this.slideInRef.close({ response: true, error: null });
         this.snackbar.success(this.translate.instant('Pool imported successfully.'));
         if (shouldTryUnlocking) {
           this.router.navigate(['/datasets', datasets[0].id, 'unlock']);
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 0a7b4c3fc85..3729d5b2124 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
@@ -16,15 +16,29 @@ import { TopologyDisk } from 'app/interfaces/storage.interface';
 import { CopyButtonComponent } from 'app/modules/buttons/copy-button/copy-button.component';
 import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { OrNotAvailablePipe } from 'app/modules/pipes/or-not-available/or-not-available.pipe';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 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';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 import { DiskInfoCardComponent } from './disk-info-card.component';
 
 describe('DiskInfoCardComponent', () => {
   let spectator: Spectator<DiskInfoCardComponent>;
   let loader: HarnessLoader;
+
+  const disk = {
+    description: '',
+    hddstandby: DiskStandby.AlwaysOn,
+    model: 'VMware_Virtual_S',
+    name: 'sda',
+    rotationrate: null,
+    serial: 'ABCD1',
+    size: 10737418240,
+    transfermode: 'Auto',
+    type: DiskType.Hdd,
+    zfs_guid: '11254578662959974657',
+  } as Disk;
+
   const createComponent = createComponentFactory({
     component: DiskInfoCardComponent,
     imports: [
@@ -36,13 +50,8 @@ describe('DiskInfoCardComponent', () => {
     ],
     providers: [
       mockAuth(),
-      mockProvider(OldSlideInService, {
-        open: jest.fn(() => ({
-          slideInClosed$: of(),
-          componentInstance: {
-            setFormDisk: jest.fn(),
-          },
-        })),
+      mockProvider(SlideIn, {
+        open: jest.fn(() => of()),
       }),
       mockProvider(ActivatedRoute, {
         snapshot: { params: { poolId: '1' } },
@@ -59,18 +68,7 @@ describe('DiskInfoCardComponent', () => {
   beforeEach(() => {
     spectator = createComponent({
       props: {
-        disk: {
-          description: '',
-          hddstandby: DiskStandby.AlwaysOn,
-          model: 'VMware_Virtual_S',
-          name: 'sda',
-          rotationrate: null,
-          serial: 'ABCD1',
-          size: 10737418240,
-          transfermode: 'Auto',
-          type: DiskType.Hdd,
-          zfs_guid: '11254578662959974657',
-        } as Disk,
+        disk,
         topologyDisk: {
           guid: '11254578662959974657',
         } as TopologyDisk,
@@ -109,7 +107,7 @@ describe('DiskInfoCardComponent', () => {
     const editButton = await loader.getHarness(MatButtonHarness.with({ text: 'Edit' }));
     await editButton.click();
 
-    expect(spectator.inject(OldSlideInService).open).toHaveBeenCalledWith(DiskFormComponent, { wide: true });
+    expect(spectator.inject(SlideIn).open).toHaveBeenCalledWith(DiskFormComponent, { wide: true, data: disk });
   });
 
   it('opens a ReplaceDiskDialogComponent when clicks Replace button', async () => {
diff --git a/src/app/pages/storage/modules/devices/components/disk-info-card/disk-info-card.component.ts b/src/app/pages/storage/modules/devices/components/disk-info-card/disk-info-card.component.ts
index 2f4b7da3921..1ce2c822c15 100644
--- a/src/app/pages/storage/modules/devices/components/disk-info-card/disk-info-card.component.ts
+++ b/src/app/pages/storage/modules/devices/components/disk-info-card/disk-info-card.component.ts
@@ -18,6 +18,7 @@ import { TopologyDisk } from 'app/interfaces/storage.interface';
 import { CopyButtonComponent } from 'app/modules/buttons/copy-button/copy-button.component';
 import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { OrNotAvailablePipe } from 'app/modules/pipes/or-not-available/or-not-available.pipe';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import {
   ReplaceDiskDialogComponent,
@@ -25,7 +26,6 @@ import {
 } 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';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 @UntilDestroy()
 @Component({
@@ -57,7 +57,7 @@ export class DiskInfoCardComponent {
 
   constructor(
     private matDialog: MatDialog,
-    private slideInService: OldSlideInService,
+    private slideIn: SlideIn,
     private route: ActivatedRoute,
     private devicesStore: DevicesStore,
   ) {}
@@ -71,10 +71,8 @@ export class DiskInfoCardComponent {
   });
 
   onEdit(): void {
-    const slideInRef = this.slideInService.open(DiskFormComponent, { wide: true });
-    slideInRef.componentInstance.setFormDisk(this.disk());
-    slideInRef.slideInClosed$.pipe(
-      filter((response) => Boolean(response)),
+    this.slideIn.open(DiskFormComponent, { wide: true, data: this.disk() }).pipe(
+      filter((response) => !!response.response),
       untilDestroyed(this),
     ).subscribe(() => this.devicesStore.reloadList());
   }
diff --git a/src/app/pages/storage/modules/disks/components/disk-bulk-edit/disk-bulk-edit.component.html b/src/app/pages/storage/modules/disks/components/disk-bulk-edit/disk-bulk-edit.component.html
index 63eba4db34c..64641ad6093 100644
--- a/src/app/pages/storage/modules/disks/components/disk-bulk-edit/disk-bulk-edit.component.html
+++ b/src/app/pages/storage/modules/disks/components/disk-bulk-edit/disk-bulk-edit.component.html
@@ -1,8 +1,8 @@
-<ix-old-modal-header
+<ix-modal-header
   [requiredRoles]="requiredRoles"
   [title]="'Bulk Edit Disks' | translate"
   [loading]="isLoading"
-></ix-old-modal-header>
+></ix-modal-header>
 
 <mat-card>
   <mat-card-content>
diff --git a/src/app/pages/storage/modules/disks/components/disk-bulk-edit/disk-bulk-edit.component.spec.ts b/src/app/pages/storage/modules/disks/components/disk-bulk-edit/disk-bulk-edit.component.spec.ts
index 4d715160bba..003c43c939f 100644
--- a/src/app/pages/storage/modules/disks/components/disk-bulk-edit/disk-bulk-edit.component.spec.ts
+++ b/src/app/pages/storage/modules/disks/components/disk-bulk-edit/disk-bulk-edit.component.spec.ts
@@ -13,7 +13,7 @@ import { CoreBulkQuery, CoreBulkResponse } from 'app/interfaces/core-bulk.interf
 import { Disk } from 'app/interfaces/disk.interface';
 import { DialogService } from 'app/modules/dialog/dialog.service';
 import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { DiskBulkEditComponent } from './disk-bulk-edit.component';
@@ -31,6 +31,7 @@ describe('DiskBulkEditComponent', () => {
   let loader: HarnessLoader;
   let form: IxFormHarness;
   let api: ApiService;
+
   const dataDisk1 = {
     name: 'sda',
     identifier: '{serial}VB76b9dd9d-4e5d8cf2',
@@ -47,6 +48,13 @@ describe('DiskBulkEditComponent', () => {
     togglesmart: true,
     smartoptions: '/dev/hd[at], /dev/sd[az]',
   } as Disk;
+
+  const slideInRef: SlideInRef<Disk[] | undefined, unknown> = {
+    close: jest.fn(),
+    requireConfirmationWhen: jest.fn(),
+    getData: jest.fn(() => [dataDisk1, dataDisk2]),
+  };
+
   const createComponent = createComponentFactory({
     component: DiskBulkEditComponent,
     imports: [
@@ -54,7 +62,7 @@ describe('DiskBulkEditComponent', () => {
     ],
     providers: [
       mockAuth(),
-      mockProvider(OldSlideInRef),
+      mockProvider(SlideInRef, slideInRef),
       mockProvider(SnackbarService),
       mockProvider(DialogService),
       mockApi([
@@ -71,7 +79,6 @@ describe('DiskBulkEditComponent', () => {
   });
 
   it('sets disks settings when form is opened', async () => {
-    spectator.component.setFormDiskBulk([dataDisk1, dataDisk2]);
     const formValue = await form.getValues();
     const diskIds = spectator.component.diskIds;
     expect(formValue).toEqual({
@@ -124,7 +131,7 @@ describe('DiskBulkEditComponent', () => {
     ];
 
     expect(api.job).toHaveBeenCalledWith('core.bulk', req);
-    expect(spectator.inject(OldSlideInRef).close).toHaveBeenCalled();
+    expect(spectator.inject(SlideInRef).close).toHaveBeenCalled();
     expect(spectator.inject(SnackbarService).success).toHaveBeenCalled();
   });
 });
diff --git a/src/app/pages/storage/modules/disks/components/disk-bulk-edit/disk-bulk-edit.component.ts b/src/app/pages/storage/modules/disks/components/disk-bulk-edit/disk-bulk-edit.component.ts
index 383ec63645c..a467181451c 100644
--- a/src/app/pages/storage/modules/disks/components/disk-bulk-edit/disk-bulk-edit.component.ts
+++ b/src/app/pages/storage/modules/disks/components/disk-bulk-edit/disk-bulk-edit.component.ts
@@ -21,8 +21,8 @@ import { IxFieldsetComponent } from 'app/modules/forms/ix-forms/components/ix-fi
 import { IxInputComponent } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.component';
 import { IxSelectComponent } from 'app/modules/forms/ix-forms/components/ix-select/ix-select.component';
 import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service';
-import { OldModalHeaderComponent } from 'app/modules/slide-ins/components/old-modal-header/old-modal-header.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
+import { ModalHeaderComponent } from 'app/modules/slide-ins/components/modal-header/modal-header.component';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
@@ -34,7 +34,7 @@ import { ApiService } from 'app/modules/websocket/api.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    OldModalHeaderComponent,
+    ModalHeaderComponent,
     MatCard,
     MatCardContent,
     ReactiveFormsModule,
@@ -73,10 +73,12 @@ export class DiskBulkEditComponent {
     private dialogService: DialogService,
     private api: ApiService,
     private translate: TranslateService,
-    private slideInRef: OldSlideInRef<DiskBulkEditComponent, boolean>,
     private snackbarService: SnackbarService,
     private errorHandler: FormErrorHandlerService,
-  ) {}
+    public slideInRef: SlideInRef<Disk[] | undefined, boolean>,
+  ) {
+    this.setFormDiskBulk(this.slideInRef.getData());
+  }
 
   setFormDiskBulk(selectedDisks: Disk[]): void {
     const setForm: DiskBulkEditComponent['form']['value'] = {
@@ -157,7 +159,7 @@ export class DiskBulkEditComponent {
           this.isLoading = false;
           const isSuccessful = job.result.every((result) => {
             if (result.error !== null) {
-              this.slideInRef.close(true);
+              this.slideInRef.close({ response: false, error: result.error });
               this.dialogService.error({
                 title: helptextDisks.dialog_error,
                 message: result.error,
@@ -169,13 +171,13 @@ export class DiskBulkEditComponent {
           });
 
           if (isSuccessful) {
-            this.slideInRef.close(true);
+            this.slideInRef.close({ response: true, error: null });
             this.snackbarService.success(successText);
           }
         },
         error: (error: unknown) => {
           this.isLoading = false;
-          this.slideInRef.close(false);
+          this.slideInRef.close({ response: false, error });
           this.errorHandler.handleValidationErrors(error, this.form);
         },
       });
diff --git a/src/app/pages/storage/modules/disks/components/disk-form/disk-form.component.html b/src/app/pages/storage/modules/disks/components/disk-form/disk-form.component.html
index 7f2f8faf34a..7c2924c9a05 100644
--- a/src/app/pages/storage/modules/disks/components/disk-form/disk-form.component.html
+++ b/src/app/pages/storage/modules/disks/components/disk-form/disk-form.component.html
@@ -1,8 +1,8 @@
-<ix-old-modal-header
+<ix-modal-header
   [requiredRoles]="requiredRoles"
   [title]="title | translate"
   [loading]="isLoading"
-></ix-old-modal-header>
+></ix-modal-header>
 
 <mat-card>
   <mat-card-content>
diff --git a/src/app/pages/storage/modules/disks/components/disk-form/disk-form.component.spec.ts b/src/app/pages/storage/modules/disks/components/disk-form/disk-form.component.spec.ts
index 8272392e11d..43216066cd6 100644
--- a/src/app/pages/storage/modules/disks/components/disk-form/disk-form.component.spec.ts
+++ b/src/app/pages/storage/modules/disks/components/disk-form/disk-form.component.spec.ts
@@ -12,7 +12,7 @@ import { DialogService } from 'app/modules/dialog/dialog.service';
 import { IxCheckboxHarness } from 'app/modules/forms/ix-forms/components/ix-checkbox/ix-checkbox.harness';
 import { IxInputHarness } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.harness';
 import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { DiskFormComponent } from './disk-form.component';
@@ -21,6 +21,7 @@ describe('DiskFormComponent', () => {
   let spectator: Spectator<DiskFormComponent>;
   let loader: HarnessLoader;
   let form: IxFormHarness;
+
   const dataDisk = {
     name: 'sdc',
     serial: 'VB9fbb6dfe-9cf26570',
@@ -36,13 +37,20 @@ describe('DiskFormComponent', () => {
     devname: 'sdc',
     identifier: '{serial}VB9fbb6dfe-9cf26570',
   } as Disk;
+
+  const slideInRef: SlideInRef<Disk | undefined, unknown> = {
+    close: jest.fn(),
+    requireConfirmationWhen: jest.fn(),
+    getData: jest.fn(() => dataDisk),
+  };
+
   const createComponent = createComponentFactory({
     component: DiskFormComponent,
     imports: [
       ReactiveFormsModule,
     ],
     providers: [
-      mockProvider(OldSlideInRef),
+      mockProvider(SlideInRef, slideInRef),
       mockProvider(DialogService),
       mockProvider(SnackbarService),
       mockApi([
@@ -67,7 +75,6 @@ describe('DiskFormComponent', () => {
   });
 
   it('sets disk settings when form is opened', async () => {
-    spectator.component.setFormDisk(dataDisk);
     const formValue = await form.getValues();
     expect(formValue).toEqual({
       'Advanced Power Management': 'Level 127 - Maximum power usage with Standby',
@@ -86,7 +93,6 @@ describe('DiskFormComponent', () => {
   });
 
   it('saves disk settings when form is saved', async () => {
-    spectator.component.setFormDisk(dataDisk);
     const changeValue = {
       'Advanced Power Management': 'Level 64 - Intermediate power usage with Standby',
       Critical: '',
@@ -114,7 +120,7 @@ describe('DiskFormComponent', () => {
       togglesmart: true,
       passwd: '',
     }]);
-    expect(spectator.inject(OldSlideInRef).close).toHaveBeenCalledWith(true);
+    expect(spectator.inject(SlideInRef).close).toHaveBeenCalledWith({ response: true, error: null });
     expect(spectator.inject(SnackbarService).success).toHaveBeenCalled();
   });
 });
diff --git a/src/app/pages/storage/modules/disks/components/disk-form/disk-form.component.ts b/src/app/pages/storage/modules/disks/components/disk-form/disk-form.component.ts
index a543d88f53a..6025061f08b 100644
--- a/src/app/pages/storage/modules/disks/components/disk-form/disk-form.component.ts
+++ b/src/app/pages/storage/modules/disks/components/disk-form/disk-form.component.ts
@@ -23,8 +23,8 @@ import { IxFieldsetComponent } from 'app/modules/forms/ix-forms/components/ix-fi
 import { IxInputComponent } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.component';
 import { IxSelectComponent } from 'app/modules/forms/ix-forms/components/ix-select/ix-select.component';
 import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service';
-import { OldModalHeaderComponent } from 'app/modules/slide-ins/components/old-modal-header/old-modal-header.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
+import { ModalHeaderComponent } from 'app/modules/slide-ins/components/modal-header/modal-header.component';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
@@ -37,7 +37,7 @@ import { ApiService } from 'app/modules/websocket/api.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    OldModalHeaderComponent,
+    ModalHeaderComponent,
     MatCard,
     MatCardContent,
     ReactiveFormsModule,
@@ -84,9 +84,10 @@ export class DiskFormComponent implements OnInit {
     private fb: FormBuilder,
     private cdr: ChangeDetectorRef,
     private errorHandler: FormErrorHandlerService,
-    private slideInRef: OldSlideInRef<DiskFormComponent, boolean>,
     private snackbarService: SnackbarService,
+    public slideInRef: SlideInRef<Disk | undefined, boolean>,
   ) {
+    this.setFormDisk(this.slideInRef.getData());
   }
 
   ngOnInit(): void {
@@ -146,7 +147,7 @@ export class DiskFormComponent implements OnInit {
         next: () => {
           this.isLoading = false;
           this.cdr.markForCheck();
-          this.slideInRef.close(true);
+          this.slideInRef.close({ response: true, error: null });
           this.snackbarService.success(this.translate.instant('Disk settings successfully saved.'));
         },
         error: (error: unknown) => {
diff --git a/src/app/pages/storage/modules/disks/components/disk-list/disk-list.component.spec.ts b/src/app/pages/storage/modules/disks/components/disk-list/disk-list.component.spec.ts
index cdb914248ee..4af48a160d6 100644
--- a/src/app/pages/storage/modules/disks/components/disk-list/disk-list.component.spec.ts
+++ b/src/app/pages/storage/modules/disks/components/disk-list/disk-list.component.spec.ts
@@ -21,6 +21,7 @@ import {
 } from 'app/modules/ix-table/components/ix-table-details-row/ix-table-details-row.component';
 import { IxTableDetailsRowDirective } from 'app/modules/ix-table/directives/ix-table-details-row.directive';
 import { PageHeaderComponent } from 'app/modules/page-header/page-title-header/page-header.component';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { DiskFormComponent } from 'app/pages/storage/modules/disks/components/disk-form/disk-form.component';
 import { DiskListComponent } from 'app/pages/storage/modules/disks/components/disk-list/disk-list.component';
 import {
@@ -29,7 +30,6 @@ import {
 import {
   ManualTestDialogComponent,
 } from 'app/pages/storage/modules/disks/components/manual-test-dialog/manual-test-dialog.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 describe('DiskListComponent', () => {
   let spectator: Spectator<DiskListComponent>;
@@ -89,13 +89,6 @@ describe('DiskListComponent', () => {
     identifier1: 'sda',
   };
 
-  const mockSlideInRef = {
-    componentInstance: {
-      setFormDisk: jest.fn(),
-    },
-    slideInClosed$: of(true),
-  };
-
   const createComponent = createComponentFactory({
     component: DiskListComponent,
     imports: [
@@ -108,8 +101,8 @@ describe('DiskListComponent', () => {
     providers: [
       mockAuth(),
       mockProvider(Router),
-      mockProvider(OldSlideInService, {
-        open: jest.fn(() => mockSlideInRef),
+      mockProvider(SlideIn, {
+        open: jest.fn(() => of()),
       }),
       mockProvider(MatDialog, {
         open: jest.fn(() => ({
@@ -166,8 +159,7 @@ describe('DiskListComponent', () => {
     const editButton = await loader.getHarness(MatButtonHarness.with({ text: 'Edit' }));
     await editButton.click();
 
-    expect(spectator.inject(OldSlideInService).open).toHaveBeenCalledWith(DiskFormComponent, { wide: true });
-    expect(mockSlideInRef.componentInstance.setFormDisk).toHaveBeenCalledWith(fakeDisk);
+    expect(spectator.inject(SlideIn).open).toHaveBeenCalledWith(DiskFormComponent, { wide: true, data: fakeDisk });
   });
 
   it('shows manual smart test dialog when Manual Test button is pressed', async () => {
diff --git a/src/app/pages/storage/modules/disks/components/disk-list/disk-list.component.ts b/src/app/pages/storage/modules/disks/components/disk-list/disk-list.component.ts
index bba73e2bfbb..6d02bf8c476 100644
--- a/src/app/pages/storage/modules/disks/components/disk-list/disk-list.component.ts
+++ b/src/app/pages/storage/modules/disks/components/disk-list/disk-list.component.ts
@@ -8,7 +8,7 @@ import { Router } from '@angular/router';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import { TranslateService, TranslateModule } from '@ngx-translate/core';
 import {
-  filter, forkJoin, map, take,
+  filter, forkJoin, map, Observable, take,
 } from 'rxjs';
 import { RequiresRolesDirective } from 'app/directives/requires-roles/requires-roles.directive';
 import { UiSearchDirective } from 'app/directives/ui-search.directive';
@@ -38,7 +38,8 @@ import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-
 import { Column, ColumnComponent } from 'app/modules/ix-table/interfaces/column-component.class';
 import { createTable } from 'app/modules/ix-table/utils';
 import { PageHeaderComponent } from 'app/modules/page-header/page-title-header/page-header.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
+import { SlideInResponse } from 'app/modules/slide-ins/slide-in.interface';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { DiskBulkEditComponent } from 'app/pages/storage/modules/disks/components/disk-bulk-edit/disk-bulk-edit.component';
@@ -46,7 +47,6 @@ import { DiskFormComponent } from 'app/pages/storage/modules/disks/components/di
 import { diskListElements } from 'app/pages/storage/modules/disks/components/disk-list/disk-list.elements';
 import { DiskWipeDialogComponent } from 'app/pages/storage/modules/disks/components/disk-wipe-dialog/disk-wipe-dialog.component';
 import { ManualTestDialogComponent, ManualTestDialogParams } from 'app/pages/storage/modules/disks/components/manual-test-dialog/manual-test-dialog.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 // TODO: Exclude AnythingUi when NAS-127632 is done
 interface DiskUi extends Disk {
@@ -232,7 +232,7 @@ export class DiskListComponent implements OnInit {
     private router: Router,
     private matDialog: MatDialog,
     private translate: TranslateService,
-    private slideInService: OldSlideInService,
+    private slideIn: SlideIn,
     protected emptyService: EmptyService,
     private cdr: ChangeDetectorRef,
   ) {}
@@ -279,18 +279,16 @@ export class DiskListComponent implements OnInit {
 
   edit(disks: DiskUi[]): void {
     const preparedDisks = this.prepareDisks(disks);
-    let slideInRef: OldSlideInRef<DiskBulkEditComponent | DiskFormComponent>;
+    let slideInRef$: Observable<SlideInResponse<boolean>>;
 
     if (preparedDisks.length > 1) {
-      slideInRef = this.slideInService.open(DiskBulkEditComponent);
-      (slideInRef as OldSlideInRef<DiskBulkEditComponent>).componentInstance.setFormDiskBulk(preparedDisks);
+      slideInRef$ = this.slideIn.open(DiskBulkEditComponent);
     } else {
-      slideInRef = this.slideInService.open(DiskFormComponent, { wide: true });
-      (slideInRef as OldSlideInRef<DiskFormComponent>).componentInstance.setFormDisk(preparedDisks[0]);
+      slideInRef$ = this.slideIn.open(DiskFormComponent, { wide: true, data: preparedDisks[0] });
     }
 
-    slideInRef.slideInClosed$.pipe(
-      filter((response) => Boolean(response)),
+    slideInRef$.pipe(
+      filter((response) => !!response.response),
       untilDestroyed(this),
     ).subscribe(() => this.dataProvider.load());
   }
diff --git a/src/app/pages/storage/pools-dashboard.component.ts b/src/app/pages/storage/pools-dashboard.component.ts
index 17ee1a92f03..d57c0b4f131 100644
--- a/src/app/pages/storage/pools-dashboard.component.ts
+++ b/src/app/pages/storage/pools-dashboard.component.ts
@@ -20,13 +20,13 @@ import { EmptyConfig } from 'app/interfaces/empty-config.interface';
 import { Pool } from 'app/interfaces/pool.interface';
 import { EmptyComponent } from 'app/modules/empty/empty.component';
 import { PageHeaderComponent } from 'app/modules/page-header/page-title-header/page-header.component';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { DashboardPoolComponent } from 'app/pages/storage/components/dashboard-pool/dashboard-pool.component';
 import { ImportPoolComponent } from 'app/pages/storage/components/import-pool/import-pool.component';
 import { UnusedResourcesComponent } from 'app/pages/storage/components/unused-resources/unused-resources.component';
 import { storageElements } from 'app/pages/storage/pools-dashboard.elements';
 import { PoolsDashboardStore } from 'app/pages/storage/stores/pools-dashboard-store.service';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 @UntilDestroy()
 @Component({
@@ -86,7 +86,7 @@ export class PoolsDashboardComponent implements OnInit {
 
   constructor(
     protected router: Router,
-    private slideInService: OldSlideInService,
+    private slideIn: SlideIn,
     private cdr: ChangeDetectorRef,
     private store: PoolsDashboardStore,
     protected translate: TranslateService,
@@ -124,8 +124,10 @@ export class PoolsDashboardComponent implements OnInit {
   }
 
   onImportPool(): void {
-    const slideinRef = this.slideInService.open(ImportPoolComponent);
-    slideinRef.slideInClosed$.pipe(filter(Boolean), untilDestroyed(this)).subscribe(() => this.store.loadDashboard());
+    this.slideIn.open(ImportPoolComponent).pipe(
+      filter((response) => !!response.response),
+      untilDestroyed(this),
+    ).subscribe(() => this.store.loadDashboard());
   }
 
   createPool(): void {
diff --git a/src/app/pages/system/alert-service/alert-service-list/alert-service-list.component.spec.ts b/src/app/pages/system/alert-service/alert-service-list/alert-service-list.component.spec.ts
index 96c8729c5e4..5794bb55f52 100644
--- a/src/app/pages/system/alert-service/alert-service-list/alert-service-list.component.spec.ts
+++ b/src/app/pages/system/alert-service/alert-service-list/alert-service-list.component.spec.ts
@@ -14,10 +14,10 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl
 import {
   IxTableColumnsSelectorComponent,
 } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { AlertServiceComponent } from 'app/pages/system/alert-service/alert-service/alert-service.component';
 import { AlertServiceListComponent } from 'app/pages/system/alert-service/alert-service-list/alert-service-list.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 describe('AlertServiceListComponent', () => {
   let spectator: Spectator<AlertServiceListComponent>;
@@ -53,10 +53,8 @@ describe('AlertServiceListComponent', () => {
       mockProvider(DialogService, {
         confirm: jest.fn(() => of(true)),
       }),
-      mockProvider(OldSlideInService, {
-        open: jest.fn(() => ({
-          slideInClosed$: of(),
-        })),
+      mockProvider(SlideIn, {
+        open: jest.fn(() => of()),
       }),
     ],
   });
@@ -81,7 +79,7 @@ describe('AlertServiceListComponent', () => {
     const editButton = await table.getHarnessInCell(IxIconHarness.with({ name: 'edit' }), 1, 4);
     await editButton.click();
 
-    expect(spectator.inject(OldSlideInService).open).toHaveBeenCalledWith(AlertServiceComponent, {
+    expect(spectator.inject(SlideIn).open).toHaveBeenCalledWith(AlertServiceComponent, {
       data: alertServices[0],
     });
   });
@@ -90,7 +88,7 @@ describe('AlertServiceListComponent', () => {
     const addButton = await loader.getHarness(MatButtonHarness.with({ text: 'Add' }));
     await addButton.click();
 
-    expect(spectator.inject(OldSlideInService).open).toHaveBeenCalledWith(AlertServiceComponent);
+    expect(spectator.inject(SlideIn).open).toHaveBeenCalledWith(AlertServiceComponent);
   });
 
   it('deletes Alert Service with confirmation when Delete button is pressed', async () => {
diff --git a/src/app/pages/system/alert-service/alert-service-list/alert-service-list.component.ts b/src/app/pages/system/alert-service/alert-service-list/alert-service-list.component.ts
index 88cd81b2629..9cbb4869f98 100644
--- a/src/app/pages/system/alert-service/alert-service-list/alert-service-list.component.ts
+++ b/src/app/pages/system/alert-service/alert-service-list/alert-service-list.component.ts
@@ -30,12 +30,12 @@ import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-h
 import { IxTablePagerComponent } from 'app/modules/ix-table/components/ix-table-pager/ix-table-pager.component';
 import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive';
 import { createTable } from 'app/modules/ix-table/utils';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { AlertServiceComponent } from 'app/pages/system/alert-service/alert-service/alert-service.component';
 import { alertServiceListElements } from 'app/pages/system/alert-service/alert-service-list/alert-service-list.elements';
 import { ErrorHandlerService } from 'app/services/error-handler.service';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 @UntilDestroy()
 @Component({
@@ -120,7 +120,7 @@ export class AlertServiceListComponent implements OnInit {
     private errorHandler: ErrorHandlerService,
     private translate: TranslateService,
     private api: ApiService,
-    private slideInService: OldSlideInService,
+    private slideIn: SlideIn,
     private dialogService: DialogService,
     private cdr: ChangeDetectorRef,
   ) { }
@@ -138,8 +138,10 @@ export class AlertServiceListComponent implements OnInit {
   }
 
   addAlertService(): void {
-    const slideInRef = this.slideInService.open(AlertServiceComponent);
-    slideInRef.slideInClosed$.pipe(filter(Boolean), untilDestroyed(this)).subscribe(() => this.getAlertServices());
+    this.slideIn.open(AlertServiceComponent).pipe(
+      filter(Boolean),
+      untilDestroyed(this),
+    ).subscribe(() => this.getAlertServices());
   }
 
   protected onListFiltered(query: string): void {
@@ -154,8 +156,10 @@ export class AlertServiceListComponent implements OnInit {
   }
 
   private editAlertService(row: AlertService): void {
-    const slideInRef = this.slideInService.open(AlertServiceComponent, { data: row });
-    slideInRef.slideInClosed$.pipe(filter(Boolean), untilDestroyed(this)).subscribe(() => this.getAlertServices());
+    this.slideIn.open(AlertServiceComponent, { data: row }).pipe(
+      filter(Boolean),
+      untilDestroyed(this),
+    ).subscribe(() => this.getAlertServices());
   }
 
   private confirmDeleteAlertService(alertService: AlertService): void {
diff --git a/src/app/pages/system/alert-service/alert-service/alert-service.component.html b/src/app/pages/system/alert-service/alert-service/alert-service.component.html
index eb569f1ade5..e7a989f697f 100644
--- a/src/app/pages/system/alert-service/alert-service/alert-service.component.html
+++ b/src/app/pages/system/alert-service/alert-service/alert-service.component.html
@@ -1,8 +1,8 @@
-<ix-old-modal-header
+<ix-modal-header
   [requiredRoles]="requiredRoles"
   [title]="isNew ? ('Add Alert Service' | translate) : ('Edit Alert Service' | translate)"
   [loading]="isLoading"
-></ix-old-modal-header>
+></ix-modal-header>
 
 <mat-card>
   <mat-card-content>
diff --git a/src/app/pages/system/alert-service/alert-service/alert-service.component.spec.ts b/src/app/pages/system/alert-service/alert-service/alert-service.component.spec.ts
index 9ff7cd2371c..ddec2cf7906 100644
--- a/src/app/pages/system/alert-service/alert-service/alert-service.component.spec.ts
+++ b/src/app/pages/system/alert-service/alert-service/alert-service.component.spec.ts
@@ -5,8 +5,7 @@ import { Component } from '@angular/core';
 import { fakeAsync, tick } from '@angular/core/testing';
 import { FormGroup } from '@angular/forms';
 import { MatButtonHarness } from '@angular/material/button/testing';
-import { createComponentFactory, Spectator } from '@ngneat/spectator/jest';
-import { MockProvider } from 'ng-mocks';
+import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest';
 import { mockCall, mockApi } from 'app/core/testing/utils/mock-api.utils';
 import { mockAuth } from 'app/core/testing/utils/mock-auth.utils';
 import { AlertLevel } from 'app/enums/alert-level.enum';
@@ -14,8 +13,7 @@ import { AlertServiceType } from 'app/enums/alert-service-type.enum';
 import { AlertService } from 'app/interfaces/alert-service.interface';
 import { DialogService } from 'app/modules/dialog/dialog.service';
 import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { AlertServiceComponent } from 'app/pages/system/alert-service/alert-service/alert-service.component';
@@ -77,6 +75,12 @@ describe('AlertServiceComponent', () => {
   let loader: HarnessLoader;
   let form: IxFormHarness;
 
+  const slideInRef: SlideInRef<undefined, unknown> = {
+    close: jest.fn(),
+    requireConfirmationWhen: jest.fn(),
+    getData: jest.fn(() => undefined),
+  };
+
   const existingService = {
     id: 4,
     name: 'Existing Service',
@@ -93,14 +97,11 @@ describe('AlertServiceComponent', () => {
   const createComponent = createComponentFactory({
     component: AlertServiceComponent,
     providers: [
-      MockProvider(OldSlideInRef, {
-        close: jest.fn(),
-      }),
-      { provide: SLIDE_IN_DATA, useValue: undefined },
-      MockProvider(SnackbarService, {
+      mockProvider(SlideInRef, slideInRef),
+      mockProvider(SnackbarService, {
         success: jest.fn(),
       }),
-      MockProvider(DialogService, {
+      mockProvider(DialogService, {
         info: jest.fn(),
       }),
       mockApi([
@@ -155,7 +156,7 @@ describe('AlertServiceComponent', () => {
         },
       }]);
       expect(spectator.inject(SnackbarService).success).toHaveBeenCalled();
-      expect(spectator.inject(OldSlideInRef).close).toHaveBeenCalled();
+      expect(spectator.inject(SlideInRef).close).toHaveBeenCalled();
     });
 
     it('sends a test alert when Send Test Alert is pressed and shows validation result', async () => {
@@ -192,7 +193,7 @@ describe('AlertServiceComponent', () => {
     beforeEach(async () => {
       spectator = createComponent({
         providers: [
-          { provide: SLIDE_IN_DATA, useValue: existingService },
+          mockProvider(SlideInRef, { ...slideInRef, getData: () => existingService }),
         ],
       });
       loader = TestbedHarnessEnvironment.loader(spectator.fixture);
@@ -237,7 +238,7 @@ describe('AlertServiceComponent', () => {
         },
       ]);
       expect(spectator.inject(SnackbarService).success).toHaveBeenCalled();
-      expect(spectator.inject(OldSlideInRef).close).toHaveBeenCalled();
+      expect(spectator.inject(SlideInRef).close).toHaveBeenCalled();
     });
   });
 });
diff --git a/src/app/pages/system/alert-service/alert-service/alert-service.component.ts b/src/app/pages/system/alert-service/alert-service/alert-service.component.ts
index 6b19eaea076..907fe85eafa 100644
--- a/src/app/pages/system/alert-service/alert-service/alert-service.component.ts
+++ b/src/app/pages/system/alert-service/alert-service/alert-service.component.ts
@@ -1,7 +1,7 @@
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
-  Component, Inject, OnInit,
+  Component, OnInit,
   Type,
   ViewContainerRef,
   viewChild,
@@ -29,9 +29,8 @@ import { IxFieldsetComponent } from 'app/modules/forms/ix-forms/components/ix-fi
 import { IxInputComponent } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.component';
 import { IxSelectComponent } from 'app/modules/forms/ix-forms/components/ix-select/ix-select.component';
 import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service';
-import { OldModalHeaderComponent } from 'app/modules/slide-ins/components/old-modal-header/old-modal-header.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { ModalHeaderComponent } from 'app/modules/slide-ins/components/modal-header/modal-header.component';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
@@ -74,7 +73,7 @@ import {
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    OldModalHeaderComponent,
+    ModalHeaderComponent,
     MatCard,
     MatCardContent,
     ReactiveFormsModule,
@@ -106,6 +105,7 @@ export class AlertServiceComponent implements OnInit {
   );
 
   isLoading = false;
+  protected readonly existingAlertService: AlertService | undefined;
 
   private readonly alertServiceContainer = viewChild('alertServiceContainer', { read: ViewContainerRef });
 
@@ -121,9 +121,9 @@ export class AlertServiceComponent implements OnInit {
     private errorHandler: FormErrorHandlerService,
     private snackbar: SnackbarService,
     private dialogService: DialogService,
-    private slideInRef: OldSlideInRef<AlertService>,
-    @Inject(SLIDE_IN_DATA) private existingAlertService: AlertService,
+    public slideInRef: SlideInRef<AlertService | undefined, boolean>,
   ) {
+    this.existingAlertService = this.slideInRef.getData();
     this.setFormEvents();
   }
 
@@ -197,7 +197,7 @@ export class AlertServiceComponent implements OnInit {
           this.isLoading = false;
           this.cdr.detectChanges();
           this.snackbar.success(this.translate.instant('Alert service saved'));
-          this.slideInRef.close(true);
+          this.slideInRef.close({ response: true, error: null });
         },
         error: (error: unknown) => {
           this.isLoading = false;
diff --git a/src/app/pages/system/bootenv/bootenv-form/bootenv-form.component.html b/src/app/pages/system/bootenv/bootenv-form/bootenv-form.component.html
index 63c22fba77a..4ffb829d059 100644
--- a/src/app/pages/system/bootenv/bootenv-form/bootenv-form.component.html
+++ b/src/app/pages/system/bootenv/bootenv-form/bootenv-form.component.html
@@ -1,8 +1,8 @@
-<ix-old-modal-header
+<ix-modal-header
   [requiredRoles]="requiredRoles"
   [title]="'Clone Boot Environment' | translate"
   [loading]="isLoading()"
-></ix-old-modal-header>
+></ix-modal-header>
 
 <mat-card>
   <mat-card-content>
diff --git a/src/app/pages/system/bootenv/bootenv-form/bootenv-form.component.spec.ts b/src/app/pages/system/bootenv/bootenv-form/bootenv-form.component.spec.ts
index 40baef5746b..c0b11d372dd 100644
--- a/src/app/pages/system/bootenv/bootenv-form/bootenv-form.component.spec.ts
+++ b/src/app/pages/system/bootenv/bootenv-form/bootenv-form.component.spec.ts
@@ -3,21 +3,28 @@ import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatButtonHarness } from '@angular/material/button/testing';
 import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest';
+import { of } from 'rxjs';
 import { mockCall, mockApi } from 'app/core/testing/utils/mock-api.utils';
 import { mockAuth } from 'app/core/testing/utils/mock-auth.utils';
 import { IxInputHarness } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.harness';
 import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service';
 import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { BootEnvironmentFormComponent } from 'app/pages/system/bootenv/bootenv-form/bootenv-form.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 describe('BootEnvironmentFormComponent', () => {
   let spectator: Spectator<BootEnvironmentFormComponent>;
   let loader: HarnessLoader;
   let api: ApiService;
+
+  const slideInRef: SlideInRef<string | undefined, unknown> = {
+    close: jest.fn(),
+    requireConfirmationWhen: jest.fn(),
+    getData: jest.fn(() => undefined),
+  };
+
   const createComponent = createComponentFactory({
     component: BootEnvironmentFormComponent,
     imports: [
@@ -27,10 +34,11 @@ describe('BootEnvironmentFormComponent', () => {
       mockApi([
         mockCall('boot.environment.clone'),
       ]),
-      mockProvider(OldSlideInService),
+      mockProvider(SlideIn, {
+        components$: of([]),
+      }),
       mockProvider(FormErrorHandlerService),
-      mockProvider(OldSlideInRef),
-      { provide: SLIDE_IN_DATA, useValue: undefined },
+      mockProvider(SlideInRef),
       mockAuth(),
     ],
   });
@@ -45,10 +53,7 @@ describe('BootEnvironmentFormComponent', () => {
     beforeEach(() => {
       spectator = createComponent({
         providers: [
-          {
-            provide: SLIDE_IN_DATA,
-            useValue: cloneSource,
-          },
+          mockProvider(SlideInRef, { ...slideInRef, getData: () => cloneSource }),
         ],
       });
       api = spectator.inject(ApiService);
diff --git a/src/app/pages/system/bootenv/bootenv-form/bootenv-form.component.ts b/src/app/pages/system/bootenv/bootenv-form/bootenv-form.component.ts
index d19436c0688..f94188267ea 100644
--- a/src/app/pages/system/bootenv/bootenv-form/bootenv-form.component.ts
+++ b/src/app/pages/system/bootenv/bootenv-form/bootenv-form.component.ts
@@ -3,7 +3,6 @@ import {
   Component,
   OnInit,
   signal,
-  inject,
 } from '@angular/core';
 import { Validators, ReactiveFormsModule } from '@angular/forms';
 import { MatButton } from '@angular/material/button';
@@ -20,9 +19,8 @@ import { FormActionsComponent } from 'app/modules/forms/ix-forms/components/form
 import { IxFieldsetComponent } from 'app/modules/forms/ix-forms/components/ix-fieldset/ix-fieldset.component';
 import { IxInputComponent } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.component';
 import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service';
-import { OldModalHeaderComponent } from 'app/modules/slide-ins/components/old-modal-header/old-modal-header.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { ModalHeaderComponent } from 'app/modules/slide-ins/components/modal-header/modal-header.component';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
 
@@ -34,7 +32,7 @@ import { ApiService } from 'app/modules/websocket/api.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    OldModalHeaderComponent,
+    ModalHeaderComponent,
     MatCard,
     MatCardContent,
     ReactiveFormsModule,
@@ -49,12 +47,13 @@ import { ApiService } from 'app/modules/websocket/api.service';
 })
 export class BootEnvironmentFormComponent implements OnInit {
   protected readonly requiredRoles = [Role.FullAdmin];
-  protected currentName = signal(inject<string>(SLIDE_IN_DATA));
   protected formGroup = this.formBuilder.group({
-    source: [this.currentName(), [Validators.required]],
+    source: ['', [Validators.required]],
     target: ['', [Validators.required, Validators.pattern(nameValidatorRegex)]],
   });
 
+  protected currentName: string | undefined;
+
   protected isLoading = signal(false);
   protected tooltips = {
     name: helptextSystemBootenv.clone_name_tooltip,
@@ -65,8 +64,11 @@ export class BootEnvironmentFormComponent implements OnInit {
     private formBuilder: FormBuilder,
     private api: ApiService,
     private errorHandler: FormErrorHandlerService,
-    private slideInRef: OldSlideInRef<BootEnvironmentFormComponent>,
-  ) {}
+    public slideInRef: SlideInRef<string | undefined, boolean>,
+  ) {
+    this.currentName = this.slideInRef.getData();
+    this.formGroup.controls.source.setValue(this.currentName);
+  }
 
   ngOnInit(): void {
     this.formGroup.controls.source.disable();
@@ -75,14 +77,14 @@ export class BootEnvironmentFormComponent implements OnInit {
   onSubmit(): void {
     this.isLoading.set(true);
     const cloneParams: BootenvCloneParams = [{
-      id: this.currentName(),
+      id: this.currentName,
       target: this.formGroup.value.target,
     }];
 
     this.api.call('boot.environment.clone', cloneParams).pipe(untilDestroyed(this)).subscribe({
       next: () => {
         this.isLoading.set(false);
-        this.slideInRef.close(true);
+        this.slideInRef.close({ response: true, error: null });
       },
       error: (error: unknown) => {
         this.isLoading.set(false);
diff --git a/src/app/pages/system/bootenv/bootenv-list/bootenv-list.component.spec.ts b/src/app/pages/system/bootenv/bootenv-list/bootenv-list.component.spec.ts
index 417d1cfb20a..d81c9a207a9 100644
--- a/src/app/pages/system/bootenv/bootenv-list/bootenv-list.component.spec.ts
+++ b/src/app/pages/system/bootenv/bootenv-list/bootenv-list.component.spec.ts
@@ -3,7 +3,7 @@ import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest';
 import { MockComponent } from 'ng-mocks';
-import { of, Subject } from 'rxjs';
+import { of } from 'rxjs';
 import { FakeFormatDateTimePipe } from 'app/core/testing/classes/fake-format-datetime.pipe';
 import { mockCall, mockApi } from 'app/core/testing/utils/mock-api.utils';
 import { mockAuth } from 'app/core/testing/utils/mock-auth.utils';
@@ -12,10 +12,10 @@ import { SearchInput1Component } from 'app/modules/forms/search-input1/search-in
 import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-table.harness';
 import { LocaleService } from 'app/modules/language/locale.service';
 import { PageHeaderComponent } from 'app/modules/page-header/page-title-header/page-header.component';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { BootEnvironmentListComponent } from 'app/pages/system/bootenv/bootenv-list/bootenv-list.component';
 import { fakeBootEnvironmentsDataSource } from 'app/pages/system/bootenv/test/fake-boot-environments';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 describe('BootEnvironmentListComponent', () => {
   let spectator: Spectator<BootEnvironmentListComponent>;
@@ -43,9 +43,8 @@ describe('BootEnvironmentListComponent', () => {
         confirm: jest.fn(() => of(true)),
       }),
       mockProvider(MatSnackBar),
-      mockProvider(OldSlideInService, {
-        onClose$: new Subject<unknown>(),
-        open: jest.fn(),
+      mockProvider(SlideIn, {
+        open: jest.fn(() => of()),
       }),
       mockAuth(),
     ],
diff --git a/src/app/pages/system/bootenv/bootenv-list/bootenv-list.component.ts b/src/app/pages/system/bootenv/bootenv-list/bootenv-list.component.ts
index f4afb467a45..88c451ab350 100644
--- a/src/app/pages/system/bootenv/bootenv-list/bootenv-list.component.ts
+++ b/src/app/pages/system/bootenv/bootenv-list/bootenv-list.component.ts
@@ -9,7 +9,7 @@ import { RouterLink } from '@angular/router';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import { TranslateService, TranslateModule } from '@ngx-translate/core';
 import {
-  filter, map, of, switchMap,
+  filter, map, Observable, of, switchMap,
   take,
 } from 'rxjs';
 import { RequiresRolesDirective } from 'app/directives/requires-roles/requires-roles.directive';
@@ -38,7 +38,8 @@ import { SortDirection } from 'app/modules/ix-table/enums/sort-direction.enum';
 import { createTable } from 'app/modules/ix-table/utils';
 import { AppLoaderService } from 'app/modules/loader/app-loader.service';
 import { PageHeaderComponent } from 'app/modules/page-header/page-title-header/page-header.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
+import { SlideInResponse } from 'app/modules/slide-ins/slide-in.interface';
 import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
@@ -47,7 +48,6 @@ import { BootEnvironmentFormComponent } from 'app/pages/system/bootenv/bootenv-f
 import { bootListElements } from 'app/pages/system/bootenv/bootenv-list/bootenv-list.elements';
 import { BootenvStatsDialogComponent } from 'app/pages/system/bootenv/bootenv-stats-dialog/bootenv-stats-dialog.component';
 import { ErrorHandlerService } from 'app/services/error-handler.service';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 // TODO: Exclude AnythingUi when NAS-127632 is done
 interface BootEnvironmentUi extends BootEnvironment {
@@ -199,7 +199,7 @@ export class BootEnvironmentListComponent implements OnInit {
     private api: ApiService,
     private matDialog: MatDialog,
     private translate: TranslateService,
-    private slideInService: OldSlideInService,
+    private slideIn: SlideIn,
     private loader: AppLoaderService,
     private dialogService: DialogService,
     private errorHandler: ErrorHandlerService,
@@ -225,9 +225,9 @@ export class BootEnvironmentListComponent implements OnInit {
     });
   }
 
-  handleSlideInClosed(slideInRef: OldSlideInRef<unknown>): void {
-    slideInRef.slideInClosed$.pipe(
-      filter(Boolean),
+  handleSlideInClosed(slideInRef$: Observable<SlideInResponse<boolean>>): void {
+    slideInRef$.pipe(
+      filter((response) => !!response.response),
       untilDestroyed(this),
     ).subscribe(() => this.refresh());
   }
@@ -237,10 +237,10 @@ export class BootEnvironmentListComponent implements OnInit {
   }
 
   doClone(bootenv: BootEnvironment): void {
-    const slideInRef = this.slideInService.open(BootEnvironmentFormComponent, {
+    const slideInRef$ = this.slideIn.open(BootEnvironmentFormComponent, {
       data: bootenv.id,
     });
-    this.handleSlideInClosed(slideInRef);
+    this.handleSlideInClosed(slideInRef$);
   }
 
   doScrub(): void {
diff --git a/src/app/pages/system/enclosure/components/jbof-list/jbof-form/jbof-form.component.html b/src/app/pages/system/enclosure/components/jbof-list/jbof-form/jbof-form.component.html
index 2c0ff94a83d..7a8690e70e6 100644
--- a/src/app/pages/system/enclosure/components/jbof-list/jbof-form/jbof-form.component.html
+++ b/src/app/pages/system/enclosure/components/jbof-list/jbof-form/jbof-form.component.html
@@ -1,4 +1,9 @@
-<ix-old-modal-header [requiredRoles]="requiredRoles" [title]="title" [loading]="isFormLoading"></ix-old-modal-header>
+<ix-modal-header
+  [requiredRoles]="requiredRoles"
+  [title]="title"
+  [loading]="isFormLoading"
+></ix-modal-header>
+
 <mat-card>
   <mat-card-content>
     <form class="ix-form-container" [formGroup]="form" (submit)="onSubmit()">
diff --git a/src/app/pages/system/enclosure/components/jbof-list/jbof-form/jbof-form.component.spec.ts b/src/app/pages/system/enclosure/components/jbof-list/jbof-form/jbof-form.component.spec.ts
index 632b1b591ff..0be789f44a2 100644
--- a/src/app/pages/system/enclosure/components/jbof-list/jbof-form/jbof-form.component.spec.ts
+++ b/src/app/pages/system/enclosure/components/jbof-list/jbof-form/jbof-form.component.spec.ts
@@ -3,21 +3,37 @@ import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatButtonHarness } from '@angular/material/button/testing';
 import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest';
+import { of } from 'rxjs';
 import { mockCall, mockApi } from 'app/core/testing/utils/mock-api.utils';
 import { mockAuth } from 'app/core/testing/utils/mock-auth.utils';
 import { Jbof } from 'app/interfaces/jbof.interface';
 import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service';
 import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { JbofFormComponent } from 'app/pages/system/enclosure/components/jbof-list/jbof-form/jbof-form.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 describe('JbofFormComponent', () => {
   let spectator: Spectator<JbofFormComponent>;
   let loader: HarnessLoader;
   let api: ApiService;
+
+  const existingJbof = {
+    id: 131,
+    description: 'editing description',
+    mgmt_ip1: '13.13.13.13',
+    mgmt_ip2: '14.14.14.14',
+    mgmt_username: 'user',
+    mgmt_password: '12345678',
+  } as Jbof;
+
+  const slideInRef: SlideInRef<undefined, unknown> = {
+    close: jest.fn(),
+    requireConfirmationWhen: jest.fn(),
+    getData: jest.fn(() => undefined),
+  };
+
   const createComponent = createComponentFactory({
     component: JbofFormComponent,
     imports: [
@@ -28,11 +44,12 @@ describe('JbofFormComponent', () => {
         mockCall('jbof.create'),
         mockCall('jbof.update'),
       ]),
-      mockProvider(OldSlideInService),
+      mockProvider(SlideIn, {
+        components$: of([]),
+      }),
       mockProvider(FormErrorHandlerService),
-      mockProvider(OldSlideInRef),
+      mockProvider(SlideInRef, slideInRef),
       mockAuth(),
-      { provide: SLIDE_IN_DATA, useValue: undefined },
     ],
   });
 
@@ -64,7 +81,7 @@ describe('JbofFormComponent', () => {
         mgmt_password: 'qwerty',
       }]);
 
-      expect(spectator.inject(OldSlideInRef).close).toHaveBeenCalled();
+      expect(spectator.inject(SlideInRef).close).toHaveBeenCalled();
     });
   });
 
@@ -72,17 +89,7 @@ describe('JbofFormComponent', () => {
     beforeEach(() => {
       spectator = createComponent({
         providers: [
-          {
-            provide: SLIDE_IN_DATA,
-            useValue: {
-              id: 131,
-              description: 'editing description',
-              mgmt_ip1: '13.13.13.13',
-              mgmt_ip2: '14.14.14.14',
-              mgmt_username: 'user',
-              mgmt_password: '12345678',
-            } as Jbof,
-          },
+          mockProvider(SlideInRef, { ...slideInRef, getData: () => existingJbof }),
         ],
       });
       loader = TestbedHarnessEnvironment.loader(spectator.fixture);
diff --git a/src/app/pages/system/enclosure/components/jbof-list/jbof-form/jbof-form.component.ts b/src/app/pages/system/enclosure/components/jbof-list/jbof-form/jbof-form.component.ts
index 3d1d2c29dfe..a7622c33c34 100644
--- a/src/app/pages/system/enclosure/components/jbof-list/jbof-form/jbof-form.component.ts
+++ b/src/app/pages/system/enclosure/components/jbof-list/jbof-form/jbof-form.component.ts
@@ -1,5 +1,5 @@
 import {
-  Component, ChangeDetectionStrategy, OnInit, ChangeDetectorRef, Inject,
+  Component, ChangeDetectionStrategy, OnInit, ChangeDetectorRef,
 } from '@angular/core';
 import { FormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
 import { MatButton } from '@angular/material/button';
@@ -15,9 +15,8 @@ import { IxFieldsetComponent } from 'app/modules/forms/ix-forms/components/ix-fi
 import { IxInputComponent } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.component';
 import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service';
 import { ipv4Validator } from 'app/modules/forms/ix-forms/validators/ip-validation';
-import { OldModalHeaderComponent } from 'app/modules/slide-ins/components/old-modal-header/old-modal-header.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { ModalHeaderComponent } from 'app/modules/slide-ins/components/modal-header/modal-header.component';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
 
@@ -28,7 +27,7 @@ import { ApiService } from 'app/modules/websocket/api.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    OldModalHeaderComponent,
+    ModalHeaderComponent,
     MatCard,
     MatCardContent,
     ReactiveFormsModule,
@@ -45,6 +44,7 @@ export class JbofFormComponent implements OnInit {
   protected readonly requiredRoles = [Role.JbofWrite];
 
   isFormLoading = false;
+  protected editingJbof: Jbof | undefined;
 
   form = this.fb.group({
     description: ['', [Validators.required]],
@@ -70,9 +70,10 @@ export class JbofFormComponent implements OnInit {
     private cdr: ChangeDetectorRef,
     private fb: FormBuilder,
     private translate: TranslateService,
-    private slideInRef: OldSlideInRef<JbofFormComponent>,
-    @Inject(SLIDE_IN_DATA) private editingJbof: Jbof,
-  ) {}
+    public slideInRef: SlideInRef<Jbof | undefined, boolean>,
+  ) {
+    this.editingJbof = this.slideInRef.getData();
+  }
 
   ngOnInit(): void {
     if (this.editingJbof) {
@@ -101,7 +102,7 @@ export class JbofFormComponent implements OnInit {
       next: () => {
         this.isFormLoading = false;
         this.cdr.markForCheck();
-        this.slideInRef.close(true);
+        this.slideInRef.close({ response: true, error: null });
       },
       error: (error: unknown) => {
         this.isFormLoading = false;
diff --git a/src/app/pages/system/enclosure/components/jbof-list/jbof-list.component.spec.ts b/src/app/pages/system/enclosure/components/jbof-list/jbof-list.component.spec.ts
index 02ec08a96cd..9f464366702 100644
--- a/src/app/pages/system/enclosure/components/jbof-list/jbof-list.component.spec.ts
+++ b/src/app/pages/system/enclosure/components/jbof-list/jbof-list.component.spec.ts
@@ -12,10 +12,10 @@ import { SearchInput1Component } from 'app/modules/forms/search-input1/search-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 { PageHeaderComponent } from 'app/modules/page-header/page-title-header/page-header.component';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { JbofFormComponent } from 'app/pages/system/enclosure/components/jbof-list/jbof-form/jbof-form.component';
 import { JbofListComponent } from 'app/pages/system/enclosure/components/jbof-list/jbof-list.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 const fakeJbofDataSource: Jbof[] = [
   {
@@ -56,11 +56,8 @@ describe('JbofListComponent', () => {
       mockProvider(DialogService, {
         confirm: jest.fn(() => of({ confirmed: true, secondaryCheckbox: false })),
       }),
-      mockProvider(OldSlideInService, {
-        open: jest.fn(() => {
-          return { slideInClosed$: of(true) };
-        }),
-        onClose$: of(),
+      mockProvider(SlideIn, {
+        open: jest.fn(() => of()),
       }),
       mockAuth(),
     ],
@@ -87,7 +84,7 @@ describe('JbofListComponent', () => {
     const editButton = await table.getHarnessInRow(IxIconHarness.with({ name: 'edit' }), 'description 1');
     await editButton.click();
 
-    expect(spectator.inject(OldSlideInService).open).toHaveBeenCalledWith(JbofFormComponent, {
+    expect(spectator.inject(SlideIn).open).toHaveBeenCalledWith(JbofFormComponent, {
       data: fakeJbofDataSource[0],
     });
   });
diff --git a/src/app/pages/system/enclosure/components/jbof-list/jbof-list.component.ts b/src/app/pages/system/enclosure/components/jbof-list/jbof-list.component.ts
index 5180bdb0c44..bd89bbdd19b 100644
--- a/src/app/pages/system/enclosure/components/jbof-list/jbof-list.component.ts
+++ b/src/app/pages/system/enclosure/components/jbof-list/jbof-list.component.ts
@@ -29,12 +29,12 @@ import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-
 import { createTable } from 'app/modules/ix-table/utils';
 import { AppLoaderService } from 'app/modules/loader/app-loader.service';
 import { PageHeaderComponent } from 'app/modules/page-header/page-title-header/page-header.component';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { JbofFormComponent } from 'app/pages/system/enclosure/components/jbof-list/jbof-form/jbof-form.component';
 import { jbofListElements } from 'app/pages/system/enclosure/components/jbof-list/jbof-list.elements';
 import { ErrorHandlerService } from 'app/services/error-handler.service';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 @UntilDestroy()
 @Component({
@@ -107,7 +107,7 @@ export class JbofListComponent implements OnInit {
 
   constructor(
     private api: ApiService,
-    private slideInService: OldSlideInService,
+    private slideIn: SlideIn,
     private dialogService: DialogService,
     private errorHandler: ErrorHandlerService,
     private translate: TranslateService,
@@ -129,8 +129,10 @@ export class JbofListComponent implements OnInit {
   }
 
   openForm(jbof?: Jbof): void {
-    const slideInRef = this.slideInService.open(JbofFormComponent, { data: jbof });
-    slideInRef.slideInClosed$.pipe(untilDestroyed(this)).subscribe(() => this.getJbofs());
+    this.slideIn.open(JbofFormComponent, { data: jbof }).pipe(
+      filter((response) => !!response.response),
+      untilDestroyed(this),
+    ).subscribe(() => this.getJbofs());
   }
 
   doDelete(jbof: Jbof): void {
diff --git a/src/app/pages/system/general-settings/email/email-card/email-card.component.spec.ts b/src/app/pages/system/general-settings/email/email-card/email-card.component.spec.ts
index 5688f96d6de..23dae7e6bfa 100644
--- a/src/app/pages/system/general-settings/email/email-card/email-card.component.spec.ts
+++ b/src/app/pages/system/general-settings/email/email-card/email-card.component.spec.ts
@@ -7,9 +7,9 @@ import { of } from 'rxjs';
 import { mockCall, mockApi } from 'app/core/testing/utils/mock-api.utils';
 import { MailSecurity } from 'app/enums/mail-security.enum';
 import { MailConfig, MailOauthConfig } from 'app/interfaces/mail-config.interface';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { EmailCardComponent } from 'app/pages/system/general-settings/email/email-card/email-card.component';
 import { EmailFormComponent } from 'app/pages/system/general-settings/email/email-form/email-form.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 const fakeEmailConfig: MailConfig = {
   id: 1,
@@ -33,8 +33,8 @@ describe('EmailCardComponent with SMTP', () => {
       mockApi([
         mockCall('mail.config', fakeEmailConfig),
       ]),
-      mockProvider(OldSlideInService, {
-        open: jest.fn(() => ({ slideInClosed$: of() })),
+      mockProvider(SlideIn, {
+        open: jest.fn(() => of()),
       }),
     ],
   });
@@ -58,7 +58,7 @@ describe('EmailCardComponent with SMTP', () => {
     const configureButton = await loader.getHarness(MatButtonHarness.with({ text: 'Settings' }));
     await configureButton.click();
 
-    expect(spectator.inject(OldSlideInService).open)
+    expect(spectator.inject(SlideIn).open)
       .toHaveBeenCalledWith(EmailFormComponent, { data: fakeEmailConfig });
   });
 });
@@ -75,7 +75,7 @@ describe('EmailCardComponent with Gmail OAuth', () => {
           oauth: { client_id: '123', provider: 'gmail' } as MailOauthConfig,
         }),
       ]),
-      mockProvider(OldSlideInService, {
+      mockProvider(SlideIn, {
         open: jest.fn(() => ({ slideInClosed$: of() })),
       }),
     ],
@@ -108,8 +108,8 @@ describe('EmailCardComponent with Outlook OAuth', () => {
           oauth: { client_id: '123', provider: 'outlook' } as MailOauthConfig,
         }),
       ]),
-      mockProvider(OldSlideInService, {
-        open: jest.fn(() => ({ slideInClosed$: of() })),
+      mockProvider(SlideIn, {
+        open: jest.fn(() => of()),
       }),
     ],
   });
diff --git a/src/app/pages/system/general-settings/email/email-card/email-card.component.ts b/src/app/pages/system/general-settings/email/email-card/email-card.component.ts
index e9f1c863554..e1d5723acc5 100644
--- a/src/app/pages/system/general-settings/email/email-card/email-card.component.ts
+++ b/src/app/pages/system/general-settings/email/email-card/email-card.component.ts
@@ -13,12 +13,12 @@ import { LoadingState, toLoadingState } from 'app/helpers/operators/to-loading-s
 import { helptextSystemEmail } from 'app/helptext/system/email';
 import { MailConfig } from 'app/interfaces/mail-config.interface';
 import { WithLoadingStateDirective } from 'app/modules/loader/directives/with-loading-state/with-loading-state.directive';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { emailCardElements } from 'app/pages/system/general-settings/email/email-card/email-card.elements';
 import { EmailFormComponent } from 'app/pages/system/general-settings/email/email-form/email-form.component';
 import { ErrorHandlerService } from 'app/services/error-handler.service';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 @UntilDestroy()
 @Component({
@@ -46,7 +46,7 @@ export class EmailCardComponent {
   emailConfig$: Observable<LoadingState<MailConfig>> = this.api.call('mail.config').pipe(toLoadingState());
 
   constructor(
-    private slideInService: OldSlideInService,
+    private slideIn: SlideIn,
     private api: ApiService,
     private cdr: ChangeDetectorRef,
     private errorHandler: ErrorHandlerService,
@@ -59,9 +59,10 @@ export class EmailCardComponent {
         untilDestroyed(this),
       )
       .subscribe((config) => {
-        const slideInRef = this.slideInService.open(EmailFormComponent, { data: config });
-
-        slideInRef.slideInClosed$.pipe(filter(Boolean), untilDestroyed(this)).subscribe(() => {
+        this.slideIn.open(EmailFormComponent, { data: config }).pipe(
+          filter((response) => !!response.response),
+          untilDestroyed(this),
+        ).subscribe(() => {
           this.api.call('mail.config').pipe(untilDestroyed(this)).subscribe((result) => {
             this.emailConfig$ = of(result).pipe(toLoadingState());
             this.cdr.markForCheck();
diff --git a/src/app/pages/system/general-settings/email/email-form/email-form.component.html b/src/app/pages/system/general-settings/email/email-form/email-form.component.html
index e3f7919b32c..99cf95c5d27 100644
--- a/src/app/pages/system/general-settings/email/email-form/email-form.component.html
+++ b/src/app/pages/system/general-settings/email/email-form/email-form.component.html
@@ -1,8 +1,8 @@
-<ix-old-modal-header
+<ix-modal-header
   [requiredRoles]="requiredRoles"
   [title]="'Email Options' | translate"
   [loading]="isLoading"
-></ix-old-modal-header>
+></ix-modal-header>
 
 <mat-card class="card">
   <mat-card-content>
diff --git a/src/app/pages/system/general-settings/email/email-form/email-form.component.spec.ts b/src/app/pages/system/general-settings/email/email-form/email-form.component.spec.ts
index 056d89fc8c7..99e4cc6de41 100644
--- a/src/app/pages/system/general-settings/email/email-form/email-form.component.spec.ts
+++ b/src/app/pages/system/general-settings/email/email-form/email-form.component.spec.ts
@@ -18,8 +18,7 @@ import { User } from 'app/interfaces/user.interface';
 import { OauthButtonComponent } from 'app/modules/buttons/oauth-button/oauth-button.component';
 import { DialogService } from 'app/modules/dialog/dialog.service';
 import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { SystemGeneralService } from 'app/services/system-general.service';
@@ -45,6 +44,12 @@ describe('EmailFormComponent', () => {
   let form: IxFormHarness;
   let api: ApiService;
 
+  const slideInRef: SlideInRef<MailConfig | undefined, unknown> = {
+    close: jest.fn(),
+    requireConfirmationWhen: jest.fn(),
+    getData: jest.fn(() => fakeEmailConfig),
+  };
+
   const createComponent = createComponentFactory({
     component: EmailFormComponent,
     imports: [
@@ -93,8 +98,7 @@ describe('EmailFormComponent', () => {
         }),
         removeEventListener: jest.fn(),
       }),
-      mockProvider(OldSlideInRef),
-      { provide: SLIDE_IN_DATA, useValue: fakeEmailConfig },
+      mockProvider(SlideInRef, slideInRef),
       mockAuth(),
     ],
   });
@@ -410,7 +414,7 @@ describe('EmailFormComponent', () => {
     beforeEach(async () => {
       spectator = createComponent({
         providers: [
-          { provide: SLIDE_IN_DATA, useValue: fakeGmailEmailConfig },
+          mockProvider(SlideInRef, { ...slideInRef, getData: () => fakeGmailEmailConfig }),
         ],
       });
       loader = TestbedHarnessEnvironment.loader(spectator.fixture);
@@ -442,7 +446,7 @@ describe('EmailFormComponent', () => {
     beforeEach(async () => {
       spectator = createComponent({
         providers: [
-          { provide: SLIDE_IN_DATA, useValue: fakeOutlookEmailConfig },
+          mockProvider(SlideInRef, { ...slideInRef, getData: () => fakeOutlookEmailConfig }),
         ],
       });
       loader = TestbedHarnessEnvironment.loader(spectator.fixture);
diff --git a/src/app/pages/system/general-settings/email/email-form/email-form.component.ts b/src/app/pages/system/general-settings/email/email-form/email-form.component.ts
index 704d82afc60..6a28e35eb31 100644
--- a/src/app/pages/system/general-settings/email/email-form/email-form.component.ts
+++ b/src/app/pages/system/general-settings/email/email-form/email-form.component.ts
@@ -1,5 +1,5 @@
 import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, OnInit,
+  ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit,
 } from '@angular/core';
 import {
   FormBuilder, FormControl, Validators, ReactiveFormsModule,
@@ -29,9 +29,8 @@ import { IxValidatorsService } from 'app/modules/forms/ix-forms/services/ix-vali
 import { emailValidator } from 'app/modules/forms/ix-forms/validators/email-validation/email-validation';
 import { portRangeValidator } from 'app/modules/forms/ix-forms/validators/range-validation/range-validation';
 import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component';
-import { OldModalHeaderComponent } from 'app/modules/slide-ins/components/old-modal-header/old-modal-header.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { ModalHeaderComponent } from 'app/modules/slide-ins/components/modal-header/modal-header.component';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
@@ -46,7 +45,7 @@ import { SystemGeneralService } from 'app/services/system-general.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    OldModalHeaderComponent,
+    ModalHeaderComponent,
     MatCard,
     MatCardContent,
     ReactiveFormsModule,
@@ -86,6 +85,7 @@ export class EmailFormComponent implements OnInit {
   });
 
   isLoading = false;
+  protected emailConfig: MailConfig | undefined;
 
   readonly sendMethodOptions$ = of([
     {
@@ -148,9 +148,10 @@ export class EmailFormComponent implements OnInit {
     private validatorService: IxValidatorsService,
     private snackbar: SnackbarService,
     private systemGeneralService: SystemGeneralService,
-    private slideInRef: OldSlideInRef<EmailFormComponent>,
-    @Inject(SLIDE_IN_DATA) private emailConfig: MailConfig,
-  ) {}
+    public slideInRef: SlideInRef<MailConfig | undefined, boolean>,
+  ) {
+    this.emailConfig = this.slideInRef.getData();
+  }
 
   get hasSmtpAuthentication(): boolean {
     return Boolean(this.form.controls.smtp.value);
@@ -210,7 +211,7 @@ export class EmailFormComponent implements OnInit {
         next: () => {
           this.isLoading = false;
           this.snackbar.success(this.translate.instant('Email settings updated.'));
-          this.slideInRef.close(true);
+          this.slideInRef.close({ response: true, error: null });
           this.cdr.markForCheck();
         },
         error: (error: unknown) => {
diff --git a/src/app/pages/system/general-settings/gui/gui-card/gui-card.component.spec.ts b/src/app/pages/system/general-settings/gui/gui-card/gui-card.component.spec.ts
index 03597889845..aed22d1ceff 100644
--- a/src/app/pages/system/general-settings/gui/gui-card/gui-card.component.spec.ts
+++ b/src/app/pages/system/general-settings/gui/gui-card/gui-card.component.spec.ts
@@ -6,9 +6,9 @@ import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectat
 import { provideMockStore } from '@ngrx/store/testing';
 import { of } from 'rxjs';
 import { mockAuth } from 'app/core/testing/utils/mock-auth.utils';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { GuiCardComponent } from 'app/pages/system/general-settings/gui/gui-card/gui-card.component';
 import { GuiFormComponent } from 'app/pages/system/general-settings/gui/gui-form/gui-form.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 import { selectPreferences } from 'app/store/preferences/preferences.selectors';
 import { selectGeneralConfig } from 'app/store/system-config/system-config.selectors';
 
@@ -45,8 +45,8 @@ describe('GuiCardComponent', () => {
           },
         ],
       }),
-      mockProvider(OldSlideInService, {
-        open: jest.fn(() => ({ slideInClosed$: of() })),
+      mockProvider(SlideIn, {
+        open: jest.fn(() => of()),
       }),
     ],
   });
@@ -78,6 +78,6 @@ describe('GuiCardComponent', () => {
     const configureButton = await loader.getHarness(MatButtonHarness.with({ text: 'Settings' }));
     await configureButton.click();
 
-    expect(spectator.inject(OldSlideInService).open).toHaveBeenCalledWith(GuiFormComponent);
+    expect(spectator.inject(SlideIn).open).toHaveBeenCalledWith(GuiFormComponent);
   });
 });
diff --git a/src/app/pages/system/general-settings/gui/gui-card/gui-card.component.ts b/src/app/pages/system/general-settings/gui/gui-card/gui-card.component.ts
index 7ba95874c3e..2a070d90f65 100644
--- a/src/app/pages/system/general-settings/gui/gui-card/gui-card.component.ts
+++ b/src/app/pages/system/general-settings/gui/gui-card/gui-card.component.ts
@@ -15,10 +15,10 @@ import { Role } from 'app/enums/role.enum';
 import { toLoadingState } from 'app/helpers/operators/to-loading-state.helper';
 import { helptextSystemGeneral as helptext } from 'app/helptext/system/general';
 import { WithLoadingStateDirective } from 'app/modules/loader/directives/with-loading-state/with-loading-state.directive';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { guiCardElements } from 'app/pages/system/general-settings/gui/gui-card/gui-card.elements';
 import { GuiFormComponent } from 'app/pages/system/general-settings/gui/gui-form/gui-form.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 import { AppState } from 'app/store';
 import { guiFormClosedWithoutSaving } from 'app/store/preferences/preferences.actions';
 import { waitForPreferences } from 'app/store/preferences/preferences.selectors';
@@ -62,13 +62,12 @@ export class GuiCardComponent {
 
   constructor(
     private store$: Store<AppState>,
-    private slideInService: OldSlideInService,
+    private slideIn: SlideIn,
   ) {}
 
   openSettings(): void {
-    const slideInRef = this.slideInService.open(GuiFormComponent);
-    slideInRef.slideInClosed$.pipe(
-      filter((response) => !response),
+    this.slideIn.open(GuiFormComponent).pipe(
+      filter((response) => !response.response),
       untilDestroyed(this),
     ).subscribe(() => this.store$.dispatch(guiFormClosedWithoutSaving()));
   }
diff --git a/src/app/pages/system/general-settings/gui/gui-form/gui-form.component.html b/src/app/pages/system/general-settings/gui/gui-form/gui-form.component.html
index f48cd083789..e4e008cd568 100644
--- a/src/app/pages/system/general-settings/gui/gui-form/gui-form.component.html
+++ b/src/app/pages/system/general-settings/gui/gui-form/gui-form.component.html
@@ -1,7 +1,8 @@
-<ix-old-modal-header
+<ix-modal-header
   [title]="'GUI Settings' | translate"
   [loading]="isFormLoading"
-></ix-old-modal-header>
+></ix-modal-header>
+
 <mat-card>
   <mat-card-content>
     <form
diff --git a/src/app/pages/system/general-settings/gui/gui-form/gui-form.component.spec.ts b/src/app/pages/system/general-settings/gui/gui-form/gui-form.component.spec.ts
index 67428af99d2..a3820d98bd1 100644
--- a/src/app/pages/system/general-settings/gui/gui-form/gui-form.component.spec.ts
+++ b/src/app/pages/system/general-settings/gui/gui-form/gui-form.component.spec.ts
@@ -17,7 +17,7 @@ import {
 } from 'app/modules/forms/ix-forms/components/with-manage-certificates-link/with-manage-certificates-link.component';
 import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service';
 import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { ThemeService } from 'app/modules/theme/theme.service';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { WebSocketHandlerService } from 'app/modules/websocket/websocket-handler.service';
@@ -54,6 +54,12 @@ describe('GuiFormComponent', () => {
     } as Certificate,
   } as SystemGeneralConfig;
 
+  const slideInRef: SlideInRef<undefined, unknown> = {
+    close: jest.fn(),
+    requireConfirmationWhen: jest.fn(),
+    getData: jest.fn(() => undefined),
+  };
+
   const createComponent = createComponentFactory({
     component: GuiFormComponent,
     imports: [
@@ -66,9 +72,7 @@ describe('GuiFormComponent', () => {
         mockCall('system.general.update', mockSystemGeneralConfig),
         mockCall('system.general.ui_restart'),
       ]),
-      mockProvider(OldSlideInRef, {
-        slideInClosed$: of(),
-      }),
+      mockProvider(SlideInRef, slideInRef),
       mockProvider(WebSocketHandlerService),
       mockProvider(WebSocketStatusService),
       mockProvider(DialogService, {
diff --git a/src/app/pages/system/general-settings/gui/gui-form/gui-form.component.ts b/src/app/pages/system/general-settings/gui/gui-form/gui-form.component.ts
index 033afd16ece..96494c85a3f 100644
--- a/src/app/pages/system/general-settings/gui/gui-form/gui-form.component.ts
+++ b/src/app/pages/system/general-settings/gui/gui-form/gui-form.component.ts
@@ -10,7 +10,7 @@ import { Store } from '@ngrx/store';
 import { TranslateService, TranslateModule } from '@ngx-translate/core';
 import { combineLatest, of } from 'rxjs';
 import {
-  filter, switchMap, takeUntil, tap,
+  filter, switchMap, tap,
 } from 'rxjs/operators';
 import { choicesToOptions } from 'app/helpers/operators/options.operators';
 import { WINDOW } from 'app/helpers/window.helper';
@@ -26,8 +26,8 @@ import { WithManageCertificatesLinkComponent } from 'app/modules/forms/ix-forms/
 import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service';
 import { ipValidator } from 'app/modules/forms/ix-forms/validators/ip-validation';
 import { AppLoaderService } from 'app/modules/loader/app-loader.service';
-import { OldModalHeaderComponent } from 'app/modules/slide-ins/components/old-modal-header/old-modal-header.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
+import { ModalHeaderComponent } from 'app/modules/slide-ins/components/modal-header/modal-header.component';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ThemeService } from 'app/modules/theme/theme.service';
 import { ApiService } from 'app/modules/websocket/api.service';
@@ -48,7 +48,7 @@ import { waitForGeneralConfig } from 'app/store/system-config/system-config.sele
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    OldModalHeaderComponent,
+    ModalHeaderComponent,
     MatCard,
     MatCardContent,
     ReactiveFormsModule,
@@ -93,7 +93,6 @@ export class GuiFormComponent {
   constructor(
     private fb: FormBuilder,
     private sysGeneralService: SystemGeneralService,
-    private slideInRef: OldSlideInRef<GuiFormComponent, boolean>,
     private themeService: ThemeService,
     private cdr: ChangeDetectorRef,
     private api: ApiService,
@@ -105,6 +104,7 @@ export class GuiFormComponent {
     private formErrorHandler: FormErrorHandlerService,
     private errorHandler: ErrorHandlerService,
     private store$: Store<AppState>,
+    public slideInRef: SlideInRef<undefined, boolean>,
     @Inject(WINDOW) private window: Window,
   ) {
     this.loadCurrentValues();
@@ -196,7 +196,7 @@ export class GuiFormComponent {
         title: this.translate.instant(helptext.dialog_confirm_title),
         message: this.translate.instant(helptext.dialog_confirm_message),
       }).pipe(
-        tap(() => this.slideInRef.close(true)),
+        tap(() => this.slideInRef.close({ response: true, error: null })),
         filter(Boolean),
         untilDestroyed(this),
       ).subscribe(() => {
@@ -230,7 +230,7 @@ export class GuiFormComponent {
         });
       });
     } else {
-      this.slideInRef.close(true);
+      this.slideInRef.close({ response: true, error: null });
     }
   }
 
@@ -261,7 +261,6 @@ export class GuiFormComponent {
 
   private setupThemePreview(): void {
     this.formGroup.controls.theme.valueChanges.pipe(
-      takeUntil(this.slideInRef.slideInClosed$),
       untilDestroyed(this),
     ).subscribe((theme) => {
       this.store$.dispatch(themeChangedInGuiForm({ theme }));
diff --git a/src/app/pages/system/general-settings/localization/localization-card/localization-card.component.spec.ts b/src/app/pages/system/general-settings/localization/localization-card/localization-card.component.spec.ts
index 9537933fd54..18d3622b9c2 100644
--- a/src/app/pages/system/general-settings/localization/localization-card/localization-card.component.spec.ts
+++ b/src/app/pages/system/general-settings/localization/localization-card/localization-card.component.spec.ts
@@ -9,9 +9,9 @@ import { mockAuth } from 'app/core/testing/utils/mock-auth.utils';
 import { Choices } from 'app/interfaces/choices.interface';
 import { Option } from 'app/interfaces/option.interface';
 import { LocaleService } from 'app/modules/language/locale.service';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { LocalizationCardComponent } from 'app/pages/system/general-settings/localization/localization-card/localization-card.component';
 import { LocalizationFormComponent } from 'app/pages/system/general-settings/localization/localization-form/localization-form.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 import { SystemGeneralService } from 'app/services/system-general.service';
 import { selectGeneralConfig } from 'app/store/system-config/system-config.selectors';
 
@@ -51,7 +51,9 @@ describe('LocalizationCardComponent', () => {
           return ['2023-03-31', '05:17:49'];
         },
       }),
-      mockProvider(OldSlideInService),
+      mockProvider(SlideIn, {
+        components$: of([]),
+      }),
     ],
   });
 
@@ -77,7 +79,7 @@ describe('LocalizationCardComponent', () => {
     const configureButton = await loader.getHarness(MatButtonHarness.with({ text: 'Settings' }));
     await configureButton.click();
 
-    expect(spectator.inject(OldSlideInService).open).toHaveBeenCalledWith(LocalizationFormComponent, {
+    expect(spectator.inject(SlideIn).open).toHaveBeenCalledWith(LocalizationFormComponent, {
       data: {
         dateFormat: undefined, kbdMap: 'us', language: 'en', timeFormat: undefined, timezone: 'America/New_York',
       },
diff --git a/src/app/pages/system/general-settings/localization/localization-card/localization-card.component.ts b/src/app/pages/system/general-settings/localization/localization-card/localization-card.component.ts
index 8577a96e23f..961ef38b0f0 100644
--- a/src/app/pages/system/general-settings/localization/localization-card/localization-card.component.ts
+++ b/src/app/pages/system/general-settings/localization/localization-card/localization-card.component.ts
@@ -17,10 +17,10 @@ import { Option } from 'app/interfaces/option.interface';
 import { SystemGeneralConfig } from 'app/interfaces/system-config.interface';
 import { LocaleService } from 'app/modules/language/locale.service';
 import { WithLoadingStateDirective } from 'app/modules/loader/directives/with-loading-state/with-loading-state.directive';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { localizationCardElements } from 'app/pages/system/general-settings/localization/localization-card/localization-card.elements';
 import { LocalizationFormComponent } from 'app/pages/system/general-settings/localization/localization-form/localization-form.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 import { SystemGeneralService } from 'app/services/system-general.service';
 import { AppState } from 'app/store';
 import { waitForGeneralConfig } from 'app/store/system-config/system-config.selectors';
@@ -67,7 +67,7 @@ export class LocalizationCardComponent {
   constructor(
     public localeService: LocaleService,
     private store$: Store<AppState>,
-    private slideInService: OldSlideInService,
+    private slideIn: SlideIn,
     private sysGeneralService: SystemGeneralService,
   ) {}
 
@@ -77,7 +77,7 @@ export class LocalizationCardComponent {
   }
 
   openSettings(config: SystemGeneralConfig): void {
-    this.slideInService.open(LocalizationFormComponent, {
+    this.slideIn.open(LocalizationFormComponent, {
       data: {
         language: config.language,
         kbdMap: config.kbdmap,
diff --git a/src/app/pages/system/general-settings/localization/localization-form/localization-form.component.html b/src/app/pages/system/general-settings/localization/localization-form/localization-form.component.html
index d5c569975c5..48cf6c0546f 100644
--- a/src/app/pages/system/general-settings/localization/localization-form/localization-form.component.html
+++ b/src/app/pages/system/general-settings/localization/localization-form/localization-form.component.html
@@ -1,7 +1,7 @@
-<ix-old-modal-header
+<ix-modal-header
   [title]="'Localization Settings' | translate"
   [loading]="isFormLoading"
-></ix-old-modal-header>
+></ix-modal-header>
 <mat-card>
   <mat-card-content>
     <form class="ix-form-container" [formGroup]="formGroup" (submit)="submit()">
diff --git a/src/app/pages/system/general-settings/localization/localization-form/localization-form.component.spec.ts b/src/app/pages/system/general-settings/localization/localization-form/localization-form.component.spec.ts
index 4f106024872..2e6d6f38015 100644
--- a/src/app/pages/system/general-settings/localization/localization-form/localization-form.component.spec.ts
+++ b/src/app/pages/system/general-settings/localization/localization-form/localization-form.component.spec.ts
@@ -14,11 +14,10 @@ import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/for
 import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness';
 import { LanguageService } from 'app/modules/language/language.service';
 import { LocaleService } from 'app/modules/language/locale.service';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { LocalizationFormComponent } from 'app/pages/system/general-settings/localization/localization-form/localization-form.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 import { SystemGeneralService } from 'app/services/system-general.service';
 import { localizationFormSubmitted } from 'app/store/preferences/preferences.actions';
 import { selectPreferences } from 'app/store/preferences/preferences.selectors';
@@ -28,6 +27,21 @@ describe('LocalizationFormComponent', () => {
   let spectator: Spectator<LocalizationFormComponent>;
   let loader: HarnessLoader;
   let api: ApiService;
+
+  const settings = {
+    dateFormat: 'yyyy-MM-dd',
+    kbdMap: 'us',
+    language: 'en',
+    timeFormat: 'HH:mm:ss',
+    timezone: 'America/Los_Angeles',
+  } as LocalizationSettings;
+
+  const slideInRef: SlideInRef<LocalizationSettings | undefined, unknown> = {
+    close: jest.fn(),
+    requireConfirmationWhen: jest.fn(),
+    getData: jest.fn(() => settings),
+  };
+
   const createComponent = createComponentFactory({
     component: LocalizationFormComponent,
     imports: [
@@ -74,7 +88,9 @@ describe('LocalizationFormComponent', () => {
           { label: '04:22:14 PM', value: 'hh:mm:ss aa' },
         ],
       }),
-      mockProvider(OldSlideInService),
+      mockProvider(SlideIn, {
+        components$: of([]),
+      }),
       mockProvider(LanguageService),
       mockProvider(FormErrorHandlerService),
       provideMockStore({
@@ -92,27 +108,13 @@ describe('LocalizationFormComponent', () => {
           },
         ],
       }),
-      mockProvider(OldSlideInRef),
-      { provide: SLIDE_IN_DATA, useValue: undefined },
+      mockProvider(SlideInRef, slideInRef),
       mockAuth(),
     ],
   });
 
   beforeEach(() => {
-    spectator = createComponent({
-      providers: [
-        {
-          provide: SLIDE_IN_DATA,
-          useValue: {
-            dateFormat: 'yyyy-MM-dd',
-            kbdMap: 'us',
-            language: 'en',
-            timeFormat: 'HH:mm:ss',
-            timezone: 'America/Los_Angeles',
-          } as LocalizationSettings,
-        },
-      ],
-    });
+    spectator = createComponent();
     loader = TestbedHarnessEnvironment.loader(spectator.fixture);
     api = spectator.inject(ApiService);
   });
@@ -154,7 +156,7 @@ describe('LocalizationFormComponent', () => {
         kbdmap: 'us',
         timezone: 'America/Los_Angeles',
       }]);
-      expect(spectator.inject(OldSlideInRef).close).toHaveBeenCalled();
+      expect(spectator.inject(SlideInRef).close).toHaveBeenCalled();
       expect(spectator.inject(LanguageService).setLanguage).toHaveBeenCalledWith('en');
     });
   });
diff --git a/src/app/pages/system/general-settings/localization/localization-form/localization-form.component.ts b/src/app/pages/system/general-settings/localization/localization-form/localization-form.component.ts
index 3e8650ecc05..5c6ebfca432 100644
--- a/src/app/pages/system/general-settings/localization/localization-form/localization-form.component.ts
+++ b/src/app/pages/system/general-settings/localization/localization-form/localization-form.component.ts
@@ -24,9 +24,8 @@ import { IxSelectComponent } from 'app/modules/forms/ix-forms/components/ix-sele
 import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service';
 import { LanguageService } from 'app/modules/language/language.service';
 import { LocaleService } from 'app/modules/language/locale.service';
-import { OldModalHeaderComponent } from 'app/modules/slide-ins/components/old-modal-header/old-modal-header.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { ModalHeaderComponent } from 'app/modules/slide-ins/components/modal-header/modal-header.component';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { SystemGeneralService } from 'app/services/system-general.service';
@@ -44,7 +43,7 @@ import { selectIsEnterprise } from 'app/store/system-info/system-info.selectors'
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    OldModalHeaderComponent,
+    ModalHeaderComponent,
     MatCard,
     MatCardContent,
     ReactiveFormsModule,
@@ -64,6 +63,7 @@ export class LocalizationFormComponent implements OnInit {
   isFormLoading = false;
 
   sortLanguagesByName = true;
+  protected localizationSettings: LocalizationSettings | undefined;
 
   formGroup = this.fb.nonNullable.group({
     language: ['', [Validators.required]],
@@ -146,10 +146,11 @@ export class LocalizationFormComponent implements OnInit {
     private errorHandler: FormErrorHandlerService,
     private cdr: ChangeDetectorRef,
     private store$: Store<AppState>,
-    private slideInRef: OldSlideInRef<LocalizationFormComponent>,
+    public slideInRef: SlideInRef<LocalizationSettings | undefined, boolean>,
     @Inject(WINDOW) private window: Window,
-    @Inject(SLIDE_IN_DATA) private localizationSettings: LocalizationSettings,
-  ) { }
+  ) {
+    this.localizationSettings = this.slideInRef.getData();
+  }
 
   ngOnInit(): void {
     if (this.localizationSettings) {
@@ -192,7 +193,7 @@ export class LocalizationFormComponent implements OnInit {
         this.store$.dispatch(generalConfigUpdated());
         this.store$.dispatch(systemInfoUpdated());
         this.isFormLoading = false;
-        this.slideInRef.close(true);
+        this.slideInRef.close({ response: true, error: null });
         this.setTimeOptions(payload.timezone);
         this.langService.setLanguage(payload.language);
         this.cdr.markForCheck();
diff --git a/src/app/pages/system/general-settings/ntp-server/ntp-server-card/ntp-server-card.component.spec.ts b/src/app/pages/system/general-settings/ntp-server/ntp-server-card/ntp-server-card.component.spec.ts
index 0af88142e78..6c04194ed07 100644
--- a/src/app/pages/system/general-settings/ntp-server/ntp-server-card/ntp-server-card.component.spec.ts
+++ b/src/app/pages/system/general-settings/ntp-server/ntp-server-card/ntp-server-card.component.spec.ts
@@ -2,17 +2,17 @@ import { HarnessLoader } from '@angular/cdk/testing';
 import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { MatButtonHarness } from '@angular/material/button/testing';
 import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest';
-import { of, Subject } from 'rxjs';
+import { of } from 'rxjs';
 import { mockCall, mockApi } from 'app/core/testing/utils/mock-api.utils';
 import { mockAuth } from 'app/core/testing/utils/mock-auth.utils';
 import { NtpServer } from 'app/interfaces/ntp-server.interface';
 import { DialogService } from 'app/modules/dialog/dialog.service';
 import { IxIconHarness } from 'app/modules/ix-icon/ix-icon.harness';
 import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-table.harness';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { NtpServerCardComponent } from 'app/pages/system/general-settings/ntp-server/ntp-server-card/ntp-server-card.component';
 import { NtpServerFormComponent } from 'app/pages/system/general-settings/ntp-server/ntp-server-form/ntp-server-form.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 const fakeDataSource: NtpServer[] = [
   {
@@ -48,7 +48,7 @@ describe('NtpServerCardComponent', () => {
   let spectator: Spectator<NtpServerCardComponent>;
   let loader: HarnessLoader;
   let api: ApiService;
-  let slideInRef: OldSlideInService;
+  let slideInRef: SlideIn;
   let table: IxTableHarness;
 
   const createComponent = createComponentFactory({
@@ -62,9 +62,8 @@ describe('NtpServerCardComponent', () => {
       mockProvider(DialogService, {
         confirm: jest.fn(() => of(true)),
       }),
-      mockProvider(OldSlideInService, {
-        onClose$: new Subject<unknown>(),
-        open: jest.fn(() => ({ slideInClosed$: of() })),
+      mockProvider(SlideIn, {
+        open: jest.fn(() => of()),
       }),
     ],
   });
@@ -73,7 +72,7 @@ describe('NtpServerCardComponent', () => {
     spectator = createComponent();
     loader = TestbedHarnessEnvironment.loader(spectator.fixture);
     api = spectator.inject(ApiService);
-    slideInRef = spectator.inject(OldSlideInService);
+    slideInRef = spectator.inject(SlideIn);
     table = await loader.getHarness(IxTableHarness);
   });
 
diff --git a/src/app/pages/system/general-settings/ntp-server/ntp-server-card/ntp-server-card.component.ts b/src/app/pages/system/general-settings/ntp-server/ntp-server-card/ntp-server-card.component.ts
index 96ce985cebe..95c47693199 100644
--- a/src/app/pages/system/general-settings/ntp-server/ntp-server-card/ntp-server-card.component.ts
+++ b/src/app/pages/system/general-settings/ntp-server/ntp-server-card/ntp-server-card.component.ts
@@ -24,12 +24,12 @@ import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-b
 import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-head/ix-table-head.component';
 import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive';
 import { createTable } from 'app/modules/ix-table/utils';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { ntpServerElements } from 'app/pages/system/general-settings/ntp-server/ntp-server-card/ntp-server-card.elements';
 import { NtpServerFormComponent } from 'app/pages/system/general-settings/ntp-server/ntp-server-form/ntp-server-form.component';
 import { ErrorHandlerService } from 'app/services/error-handler.service';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 @UntilDestroy()
 @Component({
@@ -110,7 +110,7 @@ export class NtpServerCardComponent implements OnInit {
     private errorHandler: ErrorHandlerService,
     private api: ApiService,
     private dialog: DialogService,
-    private slideInService: OldSlideInService,
+    private slideIn: SlideIn,
   ) {}
 
   ngOnInit(): void {
@@ -142,12 +142,16 @@ export class NtpServerCardComponent implements OnInit {
   }
 
   doAdd(): void {
-    const slideInRef = this.slideInService.open(NtpServerFormComponent);
-    slideInRef.slideInClosed$.pipe(filter(Boolean), untilDestroyed(this)).subscribe(() => this.loadItems());
+    this.slideIn.open(NtpServerFormComponent).pipe(
+      filter((response) => !!response.response),
+      untilDestroyed(this),
+    ).subscribe(() => this.loadItems());
   }
 
   doEdit(server: NtpServer): void {
-    const slideInRef = this.slideInService.open(NtpServerFormComponent, { data: server });
-    slideInRef.slideInClosed$.pipe(filter(Boolean), untilDestroyed(this)).subscribe(() => this.loadItems());
+    this.slideIn.open(NtpServerFormComponent, { data: server }).pipe(
+      filter((response) => !!response.response),
+      untilDestroyed(this),
+    ).subscribe(() => this.loadItems());
   }
 }
diff --git a/src/app/pages/system/general-settings/ntp-server/ntp-server-form/ntp-server-form.component.html b/src/app/pages/system/general-settings/ntp-server/ntp-server-form/ntp-server-form.component.html
index dbff58ad243..b35518e0e14 100644
--- a/src/app/pages/system/general-settings/ntp-server/ntp-server-form/ntp-server-form.component.html
+++ b/src/app/pages/system/general-settings/ntp-server/ntp-server-form/ntp-server-form.component.html
@@ -1,4 +1,8 @@
-<ix-old-modal-header [requiredRoles]="requiredRoles" [title]="title" [loading]="isFormLoading"></ix-old-modal-header>
+<ix-modal-header
+  [requiredRoles]="requiredRoles"
+  [title]="title"
+  [loading]="isFormLoading"
+></ix-modal-header>
 
 <mat-card>
   <mat-card-content>
diff --git a/src/app/pages/system/general-settings/ntp-server/ntp-server-form/ntp-server-form.component.spec.ts b/src/app/pages/system/general-settings/ntp-server/ntp-server-form/ntp-server-form.component.spec.ts
index 401a400fe05..55e655f89cc 100644
--- a/src/app/pages/system/general-settings/ntp-server/ntp-server-form/ntp-server-form.component.spec.ts
+++ b/src/app/pages/system/general-settings/ntp-server/ntp-server-form/ntp-server-form.component.spec.ts
@@ -3,15 +3,15 @@ import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatButtonHarness } from '@angular/material/button/testing';
 import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest';
+import { of } from 'rxjs';
 import { mockCall, mockApi } from 'app/core/testing/utils/mock-api.utils';
 import { mockAuth } from 'app/core/testing/utils/mock-auth.utils';
 import { NtpServer } from 'app/interfaces/ntp-server.interface';
 import { DialogService } from 'app/modules/dialog/dialog.service';
 import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { ApiService } from 'app/modules/websocket/api.service';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 import { NtpServerFormComponent } from './ntp-server-form.component';
 
 describe('NtpServerFormComponent', () => {
@@ -19,6 +19,22 @@ describe('NtpServerFormComponent', () => {
   let loader: HarnessLoader;
   let api: ApiService;
 
+  const editingNtpServer = {
+    id: 1,
+    address: 'mock.ntp.server',
+    burst: false,
+    iburst: true,
+    prefer: false,
+    minpoll: 6,
+    maxpoll: 10,
+  } as NtpServer;
+
+  const slideInRef: SlideInRef<NtpServer | undefined, unknown> = {
+    close: jest.fn(),
+    requireConfirmationWhen: jest.fn(),
+    getData: jest.fn(() => undefined),
+  };
+
   const createComponent = createComponentFactory({
     component: NtpServerFormComponent,
     imports: [
@@ -30,9 +46,10 @@ describe('NtpServerFormComponent', () => {
         mockCall('system.ntpserver.create'),
         mockCall('system.ntpserver.update'),
       ]),
-      mockProvider(OldSlideInService),
-      mockProvider(OldSlideInRef),
-      { provide: SLIDE_IN_DATA, useValue: undefined },
+      mockProvider(SlideIn, {
+        components$: of([]),
+      }),
+      mockProvider(SlideInRef, slideInRef),
       mockAuth(),
     ],
   });
@@ -70,18 +87,7 @@ describe('NtpServerFormComponent', () => {
     beforeEach(() => {
       spectator = createComponent({
         providers: [
-          {
-            provide: SLIDE_IN_DATA,
-            useValue: {
-              id: 1,
-              address: 'mock.ntp.server',
-              burst: false,
-              iburst: true,
-              prefer: false,
-              minpoll: 6,
-              maxpoll: 10,
-            } as NtpServer,
-          },
+          mockProvider(SlideInRef, { ...slideInRef, getData: () => editingNtpServer }),
         ],
       });
       loader = TestbedHarnessEnvironment.loader(spectator.fixture);
diff --git a/src/app/pages/system/general-settings/ntp-server/ntp-server-form/ntp-server-form.component.ts b/src/app/pages/system/general-settings/ntp-server/ntp-server-form/ntp-server-form.component.ts
index fc7d569da84..9f111a0925d 100644
--- a/src/app/pages/system/general-settings/ntp-server/ntp-server-form/ntp-server-form.component.ts
+++ b/src/app/pages/system/general-settings/ntp-server/ntp-server-form/ntp-server-form.component.ts
@@ -1,5 +1,5 @@
 import {
-  Component, ChangeDetectionStrategy, ChangeDetectorRef, OnInit, Inject,
+  Component, ChangeDetectionStrategy, ChangeDetectorRef, OnInit,
 } from '@angular/core';
 import { Validators, FormBuilder, ReactiveFormsModule } from '@angular/forms';
 import { MatButton } from '@angular/material/button';
@@ -17,9 +17,8 @@ import { IxFieldsetComponent } from 'app/modules/forms/ix-forms/components/ix-fi
 import { IxInputComponent } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.component';
 import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service';
 import { greaterThanFg } from 'app/modules/forms/ix-forms/validators/validators';
-import { OldModalHeaderComponent } from 'app/modules/slide-ins/components/old-modal-header/old-modal-header.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { ModalHeaderComponent } from 'app/modules/slide-ins/components/modal-header/modal-header.component';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
 
@@ -30,7 +29,7 @@ import { ApiService } from 'app/modules/websocket/api.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    OldModalHeaderComponent,
+    ModalHeaderComponent,
     MatCard,
     MatCardContent,
     ReactiveFormsModule,
@@ -48,6 +47,7 @@ export class NtpServerFormComponent implements OnInit {
   protected readonly requiredRoles = [Role.FullAdmin];
 
   isFormLoading = false;
+  protected editingServer: NtpServer | undefined;
 
   formGroup = this.fb.nonNullable.group({
     address: [''],
@@ -83,9 +83,10 @@ export class NtpServerFormComponent implements OnInit {
     private cdr: ChangeDetectorRef,
     private translate: TranslateService,
     private errorHandler: FormErrorHandlerService,
-    private slideInRef: OldSlideInRef<NtpServerFormComponent>,
-    @Inject(SLIDE_IN_DATA) private editingServer: NtpServer,
-  ) {}
+    public slideInRef: SlideInRef<NtpServer | undefined, boolean>,
+  ) {
+    this.editingServer = this.slideInRef.getData();
+  }
 
   ngOnInit(): void {
     if (this.editingServer) {
@@ -131,7 +132,7 @@ export class NtpServerFormComponent implements OnInit {
       next: () => {
         this.isFormLoading = false;
         this.cdr.markForCheck();
-        this.slideInRef.close(true);
+        this.slideInRef.close({ response: true, error: null });
       },
       error: (error: unknown) => {
         this.isFormLoading = false;
diff --git a/src/app/pages/system/general-settings/support/license/license.component.html b/src/app/pages/system/general-settings/support/license/license.component.html
index c50b114b2ba..c7f9d5ce95c 100644
--- a/src/app/pages/system/general-settings/support/license/license.component.html
+++ b/src/app/pages/system/general-settings/support/license/license.component.html
@@ -1,4 +1,9 @@
-<ix-old-modal-header [requiredRoles]="requiredRoles" [title]="title" [loading]="isFormLoading"></ix-old-modal-header>
+<ix-modal-header
+  [requiredRoles]="requiredRoles"
+  [title]="title"
+  [loading]="isFormLoading"
+></ix-modal-header>
+
 <mat-card>
   <mat-card-content>
     <form class="ix-form-container" [formGroup]="form" (submit)="onSubmit()">
diff --git a/src/app/pages/system/general-settings/support/license/license.component.spec.ts b/src/app/pages/system/general-settings/support/license/license.component.spec.ts
index 3d1bd456597..5ad7348bbb7 100644
--- a/src/app/pages/system/general-settings/support/license/license.component.spec.ts
+++ b/src/app/pages/system/general-settings/support/license/license.component.spec.ts
@@ -3,21 +3,28 @@ import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatButtonHarness } from '@angular/material/button/testing';
 import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest';
+import { of } from 'rxjs';
 import { mockCall, mockApi } from 'app/core/testing/utils/mock-api.utils';
 import { mockAuth } from 'app/core/testing/utils/mock-auth.utils';
 import { DialogService } from 'app/modules/dialog/dialog.service';
 import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service';
 import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { ApiService } from 'app/modules/websocket/api.service';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 import { LicenseComponent } from './license.component';
 
 describe('LicenseComponent', () => {
   let spectator: Spectator<LicenseComponent>;
   let loader: HarnessLoader;
   let api: ApiService;
+
+  const slideInRef: SlideInRef<undefined, unknown> = {
+    close: jest.fn(),
+    requireConfirmationWhen: jest.fn(),
+    getData: jest.fn(() => undefined),
+  };
+
   const createComponent = createComponentFactory({
     component: LicenseComponent,
     imports: [
@@ -27,11 +34,12 @@ describe('LicenseComponent', () => {
       mockApi([
         mockCall('system.license_update'),
       ]),
-      mockProvider(OldSlideInService),
+      mockProvider(SlideIn, {
+        components$: of([]),
+      }),
       mockProvider(DialogService),
       mockProvider(FormErrorHandlerService),
-      mockProvider(OldSlideInRef),
-      { provide: SLIDE_IN_DATA, useValue: undefined },
+      mockProvider(SlideInRef, slideInRef),
       mockAuth(),
     ],
   });
diff --git a/src/app/pages/system/general-settings/support/license/license.component.ts b/src/app/pages/system/general-settings/support/license/license.component.ts
index cc705b46ef1..131a1f84f71 100644
--- a/src/app/pages/system/general-settings/support/license/license.component.ts
+++ b/src/app/pages/system/general-settings/support/license/license.component.ts
@@ -16,8 +16,8 @@ import { FormActionsComponent } from 'app/modules/forms/ix-forms/components/form
 import { IxFieldsetComponent } from 'app/modules/forms/ix-forms/components/ix-fieldset/ix-fieldset.component';
 import { IxTextareaComponent } from 'app/modules/forms/ix-forms/components/ix-textarea/ix-textarea.component';
 import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service';
-import { OldModalHeaderComponent } from 'app/modules/slide-ins/components/old-modal-header/old-modal-header.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
+import { ModalHeaderComponent } from 'app/modules/slide-ins/components/modal-header/modal-header.component';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
 
@@ -28,7 +28,7 @@ import { ApiService } from 'app/modules/websocket/api.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    OldModalHeaderComponent,
+    ModalHeaderComponent,
     MatCard,
     MatCardContent,
     ReactiveFormsModule,
@@ -59,10 +59,10 @@ export class LicenseComponent {
   constructor(
     private fb: FormBuilder,
     private dialogService: DialogService,
-    private slideInRef: OldSlideInRef<LicenseComponent>,
     protected api: ApiService,
     private cdr: ChangeDetectorRef,
     private errorHandler: FormErrorHandlerService,
+    public slideInRef: SlideInRef<undefined, boolean>,
   ) {}
 
   onSubmit(): void {
@@ -72,7 +72,7 @@ export class LicenseComponent {
     this.api.call('system.license_update', [license]).pipe(untilDestroyed(this)).subscribe({
       next: () => {
         this.isFormLoading = false;
-        this.slideInRef.close(true);
+        this.slideInRef.close({ response: true, error: null });
         this.cdr.markForCheck();
         setTimeout(() => {
           this.dialogService.confirm({
diff --git a/src/app/pages/system/general-settings/support/proactive/proactive.component.html b/src/app/pages/system/general-settings/support/proactive/proactive.component.html
index e5f1d9ae9e4..a07a4d619d3 100644
--- a/src/app/pages/system/general-settings/support/proactive/proactive.component.html
+++ b/src/app/pages/system/general-settings/support/proactive/proactive.component.html
@@ -1,8 +1,8 @@
-<ix-old-modal-header
+<ix-modal-header
   [requiredRoles]="requiredRoles"
   [title]="title | translate"
   [loading]="isLoading"
-></ix-old-modal-header>
+></ix-modal-header>
 
 <mat-card>
   <mat-card-content>
diff --git a/src/app/pages/system/general-settings/support/proactive/proactive.component.scss b/src/app/pages/system/general-settings/support/proactive/proactive.component.scss
index df41159c5c8..911095a7644 100644
--- a/src/app/pages/system/general-settings/support/proactive/proactive.component.scss
+++ b/src/app/pages/system/general-settings/support/proactive/proactive.component.scss
@@ -21,3 +21,7 @@
     }
   }
 }
+
+.form-actions {
+  padding: 0 11px;
+}
diff --git a/src/app/pages/system/general-settings/support/proactive/proactive.component.spec.ts b/src/app/pages/system/general-settings/support/proactive/proactive.component.spec.ts
index ea16af41622..2c45647979a 100644
--- a/src/app/pages/system/general-settings/support/proactive/proactive.component.spec.ts
+++ b/src/app/pages/system/general-settings/support/proactive/proactive.component.spec.ts
@@ -6,6 +6,7 @@ import {
   createComponentFactory, mockProvider,
   Spectator,
 } from '@ngneat/spectator/jest';
+import { of } from 'rxjs';
 import { MockApiService } from 'app/core/testing/classes/mock-api.service';
 import { mockCall, mockApi } from 'app/core/testing/utils/mock-api.utils';
 import { mockAuth } from 'app/core/testing/utils/mock-auth.utils';
@@ -13,11 +14,10 @@ import { DialogService } from 'app/modules/dialog/dialog.service';
 import { SupportConfig } from 'app/modules/feedback/interfaces/file-ticket.interface';
 import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service';
 import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { ProactiveComponent } from 'app/pages/system/general-settings/support/proactive/proactive.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 describe('ProactiveComponent', () => {
   let spectator: Spectator<ProactiveComponent>;
@@ -25,6 +25,12 @@ describe('ProactiveComponent', () => {
   let api: ApiService;
   let form: IxFormHarness;
 
+  const slideInRef: SlideInRef<undefined, unknown> = {
+    close: jest.fn(),
+    requireConfirmationWhen: jest.fn(),
+    getData: jest.fn(() => undefined),
+  };
+
   const createComponent = createComponentFactory({
     component: ProactiveComponent,
     imports: [
@@ -49,10 +55,11 @@ describe('ProactiveComponent', () => {
         mockCall('support.is_available_and_enabled', true),
       ]),
       mockProvider(FormErrorHandlerService),
-      mockProvider(OldSlideInService),
+      mockProvider(SlideIn, {
+        components$: of([]),
+      }),
       mockProvider(DialogService),
-      mockProvider(OldSlideInRef),
-      { provide: SLIDE_IN_DATA, useValue: undefined },
+      mockProvider(SlideInRef, slideInRef),
     ],
   });
 
@@ -101,7 +108,7 @@ describe('ProactiveComponent', () => {
       secondary_email: 'test-user@test-user.com',
       secondary_phone: '+999999999',
     }]);
-    expect(spectator.inject(OldSlideInRef).close).toHaveBeenCalled();
+    expect(spectator.inject(SlideInRef).close).toHaveBeenCalled();
   });
 
   it('shows a warning when support is not available', async () => {
diff --git a/src/app/pages/system/general-settings/support/proactive/proactive.component.ts b/src/app/pages/system/general-settings/support/proactive/proactive.component.ts
index 170ae96e825..601a80c65c6 100644
--- a/src/app/pages/system/general-settings/support/proactive/proactive.component.ts
+++ b/src/app/pages/system/general-settings/support/proactive/proactive.component.ts
@@ -22,8 +22,8 @@ import { IxFieldsetComponent } from 'app/modules/forms/ix-forms/components/ix-fi
 import { IxInputComponent } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.component';
 import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service';
 import { emailValidator } from 'app/modules/forms/ix-forms/validators/email-validation/email-validation';
-import { OldModalHeaderComponent } from 'app/modules/slide-ins/components/old-modal-header/old-modal-header.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
+import { ModalHeaderComponent } from 'app/modules/slide-ins/components/modal-header/modal-header.component';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
@@ -37,7 +37,7 @@ import { ErrorHandlerService } from 'app/services/error-handler.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    OldModalHeaderComponent,
+    ModalHeaderComponent,
     MatCard,
     MatCardContent,
     ReactiveFormsModule,
@@ -76,10 +76,10 @@ export class ProactiveComponent implements OnInit {
     private api: ApiService,
     private cdr: ChangeDetectorRef,
     private dialogService: DialogService,
-    private slideInRef: OldSlideInRef<ProactiveComponent>,
     private formErrorHandler: FormErrorHandlerService,
     private translate: TranslateService,
     private snackbar: SnackbarService,
+    public slideInRef: SlideInRef<undefined, boolean>,
   ) {}
 
   ngOnInit(): void {
@@ -96,7 +96,7 @@ export class ProactiveComponent implements OnInit {
         next: () => {
           this.isLoading = false;
           this.cdr.markForCheck();
-          this.slideInRef.close(true);
+          this.slideInRef.close({ response: true, error: null });
 
           this.snackbar.success(
             this.translate.instant(helptext.proactive.dialog_message),
diff --git a/src/app/pages/system/general-settings/support/support-card/support-card.component.ts b/src/app/pages/system/general-settings/support/support-card/support-card.component.ts
index 5ad9b8ebb6a..390da8b5c7d 100644
--- a/src/app/pages/system/general-settings/support/support-card/support-card.component.ts
+++ b/src/app/pages/system/general-settings/support/support-card/support-card.component.ts
@@ -28,6 +28,7 @@ import {
 } from 'app/modules/forms/ix-forms/components/ix-slide-toggle/ix-slide-toggle.component';
 import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component';
 import { AppLoaderService } from 'app/modules/loader/app-loader.service';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
@@ -43,7 +44,6 @@ import { supportCardElements } from 'app/pages/system/general-settings/support/s
 import { SysInfoComponent } from 'app/pages/system/general-settings/support/sys-info/sys-info.component';
 import { SystemInfoInSupport } from 'app/pages/system/general-settings/support/system-info-in-support.interface';
 import { ErrorHandlerService } from 'app/services/error-handler.service';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 import { AppState } from 'app/store';
 import { waitForSystemInfo } from 'app/store/system-info/system-info.selectors';
 
@@ -96,7 +96,7 @@ export class SupportCardComponent implements OnInit {
     protected api: ApiService,
     private loader: AppLoaderService,
     private matDialog: MatDialog,
-    private slideInService: OldSlideInService,
+    private slideIn: SlideIn,
     private store$: Store<AppState>,
     private snackbar: SnackbarService,
     private translate: TranslateService,
@@ -153,7 +153,7 @@ export class SupportCardComponent implements OnInit {
   }
 
   updateLicense(): void {
-    this.slideInService.open(LicenseComponent);
+    this.slideIn.open(LicenseComponent);
   }
 
   feedbackDialog(): void {
@@ -161,7 +161,7 @@ export class SupportCardComponent implements OnInit {
   }
 
   openProactive(): void {
-    this.slideInService.open(ProactiveComponent, { wide: true });
+    this.slideIn.open(ProactiveComponent, { wide: true });
   }
 
   updateProductionStatus(newStatus: boolean): void {
diff --git a/src/app/pages/vm/devices/device-form/device-form.component.html b/src/app/pages/vm/devices/device-form/device-form.component.html
index 098fc7f88cd..753eebd986b 100644
--- a/src/app/pages/vm/devices/device-form/device-form.component.html
+++ b/src/app/pages/vm/devices/device-form/device-form.component.html
@@ -1,4 +1,8 @@
-<ix-old-modal-header [requiredRoles]="requiredRoles" [title]="title" [loading]="isLoading"></ix-old-modal-header>
+<ix-modal-header
+  [requiredRoles]="requiredRoles"
+  [title]="title"
+  [loading]="isLoading"
+></ix-modal-header>
 
 <mat-card>
   <mat-card-content>
@@ -214,7 +218,6 @@
           mat-button
           color="primary"
           ixTest="save"
-          [disabled]="typeSpecificForm.invalid || isLoading"
         >
           {{ 'Save' | translate }}
         </button>
diff --git a/src/app/pages/vm/devices/device-form/device-form.component.spec.ts b/src/app/pages/vm/devices/device-form/device-form.component.spec.ts
index 489c6293029..a4e3b6f4f84 100644
--- a/src/app/pages/vm/devices/device-form/device-form.component.spec.ts
+++ b/src/app/pages/vm/devices/device-form/device-form.component.spec.ts
@@ -24,12 +24,11 @@ import {
 import { DialogService } from 'app/modules/dialog/dialog.service';
 import { IxSelectHarness } from 'app/modules/forms/ix-forms/components/ix-select/ix-select.harness';
 import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { DeviceFormComponent } from 'app/pages/vm/devices/device-form/device-form.component';
 import { FilesystemService } from 'app/services/filesystem.service';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 import { VmService } from 'app/services/vm.service';
 
 describe('DeviceFormComponent', () => {
@@ -38,6 +37,13 @@ describe('DeviceFormComponent', () => {
   let form: IxFormHarness;
   let saveButton: MatButtonHarness;
   let api: ApiService;
+
+  const slideInRef: SlideInRef<{ virtualMachineId: number; device: VmDevice } | undefined, unknown> = {
+    close: jest.fn(),
+    requireConfirmationWhen: jest.fn(),
+    getData: jest.fn(() => undefined),
+  };
+
   const createComponent = createComponentFactory({
     component: DeviceFormComponent,
     imports: [
@@ -94,13 +100,14 @@ describe('DeviceFormComponent', () => {
       mockProvider(DialogService, {
         confirm: jest.fn(() => of(true)),
       }),
-      mockProvider(OldSlideInService),
+      mockProvider(SlideIn, {
+        components$: of([]),
+      }),
       mockProvider(FilesystemService),
-      mockProvider(OldSlideInRef),
+      mockProvider(SlideInRef, slideInRef),
       mockProvider(VmService, {
         hasVirtualizationSupport$: of(true),
       }),
-      { provide: SLIDE_IN_DATA, useValue: undefined },
     ],
   });
 
@@ -119,17 +126,12 @@ describe('DeviceFormComponent', () => {
       beforeEach(async () => {
         spectator = createComponent({
           providers: [
-            {
-              provide: SLIDE_IN_DATA,
-              useValue: {
-                virtualMachineId: 45,
-              },
-            },
+            mockProvider(SlideInRef, { ...slideInRef, getData: jest.fn(() => ({ virtualMachineId: 45 })) }),
           ],
         });
         loader = TestbedHarnessEnvironment.loader(spectator.fixture);
         form = await loader.getHarness(IxFormHarness);
-        saveButton = await loader.getHarness(MatButtonHarness);
+        saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save' }));
         api = spectator.inject(ApiService);
       });
 
@@ -150,7 +152,7 @@ describe('DeviceFormComponent', () => {
           order: 1002,
           vm: 45,
         }]);
-        expect(spectator.inject(OldSlideInRef).close).toHaveBeenCalled();
+        expect(spectator.inject(SlideInRef).close).toHaveBeenCalled();
       });
     });
 
@@ -158,18 +160,15 @@ describe('DeviceFormComponent', () => {
       beforeEach(async () => {
         spectator = createComponent({
           providers: [
-            {
-              provide: SLIDE_IN_DATA,
-              useValue: {
-                virtualMachineId: 45,
-                device: existingCdRom,
-              },
-            },
+            mockProvider(SlideInRef, {
+              ...slideInRef,
+              getData: jest.fn(() => ({ virtualMachineId: 45, device: existingCdRom })),
+            }),
           ],
         });
         loader = TestbedHarnessEnvironment.loader(spectator.fixture);
         form = await loader.getHarness(IxFormHarness);
-        saveButton = await loader.getHarness(MatButtonHarness);
+        saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save' }));
         api = spectator.inject(ApiService);
       });
 
@@ -217,17 +216,12 @@ describe('DeviceFormComponent', () => {
       beforeEach(async () => {
         spectator = createComponent({
           providers: [
-            {
-              provide: SLIDE_IN_DATA,
-              useValue: {
-                virtualMachineId: 45,
-              },
-            },
+            mockProvider(SlideInRef, { ...slideInRef, getData: jest.fn(() => ({ virtualMachineId: 45 })) }),
           ],
         });
         loader = TestbedHarnessEnvironment.loader(spectator.fixture);
         form = await loader.getHarness(IxFormHarness);
-        saveButton = await loader.getHarness(MatButtonHarness);
+        saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save' }));
         api = spectator.inject(ApiService);
       });
 
@@ -290,18 +284,18 @@ describe('DeviceFormComponent', () => {
       beforeEach(async () => {
         spectator = createComponent({
           providers: [
-            {
-              provide: SLIDE_IN_DATA,
-              useValue: {
+            mockProvider(SlideInRef, {
+              ...slideInRef,
+              getData: jest.fn(() => ({
                 virtualMachineId: 45,
                 device: existingNic,
-              },
-            },
+              })),
+            }),
           ],
         });
         loader = TestbedHarnessEnvironment.loader(spectator.fixture);
         form = await loader.getHarness(IxFormHarness);
-        saveButton = await loader.getHarness(MatButtonHarness);
+        saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save' }));
         api = spectator.inject(ApiService);
       });
 
@@ -336,17 +330,12 @@ describe('DeviceFormComponent', () => {
       beforeEach(async () => {
         spectator = createComponent({
           providers: [
-            {
-              provide: SLIDE_IN_DATA,
-              useValue: {
-                virtualMachineId: 45,
-              },
-            },
+            mockProvider(SlideInRef, { ...slideInRef, getData: jest.fn(() => ({ virtualMachineId: 45 })) }),
           ],
         });
         loader = TestbedHarnessEnvironment.loader(spectator.fixture);
         form = await loader.getHarness(IxFormHarness);
-        saveButton = await loader.getHarness(MatButtonHarness);
+        saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save' }));
         api = spectator.inject(ApiService);
       });
 
@@ -381,18 +370,15 @@ describe('DeviceFormComponent', () => {
       beforeEach(async () => {
         spectator = createComponent({
           providers: [
-            {
-              provide: SLIDE_IN_DATA,
-              useValue: {
-                virtualMachineId: 45,
-                device: existingDisk,
-              },
-            },
+            mockProvider(SlideInRef, {
+              ...slideInRef,
+              getData: jest.fn(() => ({ virtualMachineId: 45, device: existingDisk })),
+            }),
           ],
         });
         loader = TestbedHarnessEnvironment.loader(spectator.fixture);
         form = await loader.getHarness(IxFormHarness);
-        saveButton = await loader.getHarness(MatButtonHarness);
+        saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save' }));
         api = spectator.inject(ApiService);
       });
 
@@ -449,17 +435,12 @@ describe('DeviceFormComponent', () => {
       beforeEach(async () => {
         spectator = createComponent({
           providers: [
-            {
-              provide: SLIDE_IN_DATA,
-              useValue: {
-                virtualMachineId: 45,
-              },
-            },
+            mockProvider(SlideInRef, { ...slideInRef, getData: jest.fn(() => ({ virtualMachineId: 45 })) }),
           ],
         });
         loader = TestbedHarnessEnvironment.loader(spectator.fixture);
         form = await loader.getHarness(IxFormHarness);
-        saveButton = await loader.getHarness(MatButtonHarness);
+        saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save' }));
         api = spectator.inject(ApiService);
       });
 
@@ -495,18 +476,15 @@ describe('DeviceFormComponent', () => {
       beforeEach(async () => {
         spectator = createComponent({
           providers: [
-            {
-              provide: SLIDE_IN_DATA,
-              useValue: {
-                virtualMachineId: 45,
-                device: existingRawFile,
-              },
-            },
+            mockProvider(SlideInRef, {
+              ...slideInRef,
+              getData: jest.fn(() => ({ virtualMachineId: 45, device: existingRawFile })),
+            }),
           ],
         });
         loader = TestbedHarnessEnvironment.loader(spectator.fixture);
         form = await loader.getHarness(IxFormHarness);
-        saveButton = await loader.getHarness(MatButtonHarness);
+        saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save' }));
         api = spectator.inject(ApiService);
       });
 
@@ -559,17 +537,12 @@ describe('DeviceFormComponent', () => {
       beforeEach(async () => {
         spectator = createComponent({
           providers: [
-            {
-              provide: SLIDE_IN_DATA,
-              useValue: {
-                virtualMachineId: 45,
-              },
-            },
+            mockProvider(SlideInRef, { ...slideInRef, getData: jest.fn(() => ({ virtualMachineId: 45 })) }),
           ],
         });
         loader = TestbedHarnessEnvironment.loader(spectator.fixture);
         form = await loader.getHarness(IxFormHarness);
-        saveButton = await loader.getHarness(MatButtonHarness);
+        saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save' }));
         api = spectator.inject(ApiService);
       });
 
@@ -600,18 +573,16 @@ describe('DeviceFormComponent', () => {
       beforeEach(async () => {
         spectator = createComponent({
           providers: [
-            {
-              provide: SLIDE_IN_DATA,
-              useValue: {
-                virtualMachineId: 45,
-                device: existingPassthrough,
-              },
-            },
+            mockProvider(SlideInRef, {
+              ...slideInRef,
+              getData: jest.fn(() => ({ virtualMachineId: 45, device: existingPassthrough })),
+            }),
+
           ],
         });
         loader = TestbedHarnessEnvironment.loader(spectator.fixture);
         form = await loader.getHarness(IxFormHarness);
-        saveButton = await loader.getHarness(MatButtonHarness);
+        saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save' }));
         api = spectator.inject(ApiService);
       });
 
@@ -668,18 +639,15 @@ describe('DeviceFormComponent', () => {
       beforeEach(async () => {
         spectator = createComponent({
           providers: [
-            {
-              provide: SLIDE_IN_DATA,
-              useValue: {
-                virtualMachineId: 45,
-                device: existingDisplay,
-              },
-            },
+            mockProvider(SlideInRef, {
+              ...slideInRef,
+              getData: jest.fn(() => ({ virtualMachineId: 45, device: existingDisplay })),
+            }),
           ],
         });
         loader = TestbedHarnessEnvironment.loader(spectator.fixture);
         form = await loader.getHarness(IxFormHarness);
-        saveButton = await loader.getHarness(MatButtonHarness);
+        saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save' }));
         api = spectator.inject(ApiService);
       });
 
@@ -700,17 +668,12 @@ describe('DeviceFormComponent', () => {
       beforeEach(async () => {
         spectator = createComponent({
           providers: [
-            {
-              provide: SLIDE_IN_DATA,
-              useValue: {
-                virtualMachineId: 46,
-              },
-            },
+            mockProvider(SlideInRef, { ...slideInRef, getData: jest.fn(() => ({ virtualMachineId: 46 })) }),
           ],
         });
         loader = TestbedHarnessEnvironment.loader(spectator.fixture);
         form = await loader.getHarness(IxFormHarness);
-        saveButton = await loader.getHarness(MatButtonHarness);
+        saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save' }));
         api = spectator.inject(ApiService);
       });
 
@@ -739,17 +702,12 @@ describe('DeviceFormComponent', () => {
       beforeEach(async () => {
         spectator = createComponent({
           providers: [
-            {
-              provide: SLIDE_IN_DATA,
-              useValue: {
-                virtualMachineId: 45,
-              },
-            },
+            mockProvider(SlideInRef, { ...slideInRef, getData: jest.fn(() => ({ virtualMachineId: 45 })) }),
           ],
         });
         loader = TestbedHarnessEnvironment.loader(spectator.fixture);
         form = await loader.getHarness(IxFormHarness);
-        saveButton = await loader.getHarness(MatButtonHarness);
+        saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save' }));
         api = spectator.inject(ApiService);
       });
 
@@ -779,18 +737,15 @@ describe('DeviceFormComponent', () => {
       beforeEach(async () => {
         spectator = createComponent({
           providers: [
-            {
-              provide: SLIDE_IN_DATA,
-              useValue: {
-                virtualMachineId: 45,
-                device: existingUsb,
-              },
-            },
+            mockProvider(SlideInRef, {
+              ...slideInRef,
+              getData: jest.fn(() => ({ virtualMachineId: 45, device: existingUsb })),
+            }),
           ],
         });
         loader = TestbedHarnessEnvironment.loader(spectator.fixture);
         form = await loader.getHarness(IxFormHarness);
-        saveButton = await loader.getHarness(MatButtonHarness);
+        saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save' }));
         api = spectator.inject(ApiService);
       });
 
diff --git a/src/app/pages/vm/devices/device-form/device-form.component.ts b/src/app/pages/vm/devices/device-form/device-form.component.ts
index c0bf408d5a0..cdc1a053824 100644
--- a/src/app/pages/vm/devices/device-form/device-form.component.ts
+++ b/src/app/pages/vm/devices/device-form/device-form.component.ts
@@ -1,5 +1,5 @@
 import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, OnInit,
+  ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit,
 } from '@angular/core';
 import {
   FormBuilder, FormControl, Validators, ReactiveFormsModule,
@@ -35,9 +35,8 @@ import { IxFieldsetComponent } from 'app/modules/forms/ix-forms/components/ix-fi
 import { IxInputComponent } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.component';
 import { IxSelectComponent } from 'app/modules/forms/ix-forms/components/ix-select/ix-select.component';
 import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service';
-import { OldModalHeaderComponent } from 'app/modules/slide-ins/components/old-modal-header/old-modal-header.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { ModalHeaderComponent } from 'app/modules/slide-ins/components/modal-header/modal-header.component';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
@@ -55,7 +54,7 @@ const specifyCustom = T('Specify custom');
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    OldModalHeaderComponent,
+    ModalHeaderComponent,
     MatCard,
     MatCardContent,
     ReactiveFormsModule,
@@ -89,6 +88,7 @@ export class DeviceFormComponent implements OnInit {
   }
 
   existingDevice: VmDevice;
+  protected slideInData: { virtualMachineId?: number; device?: VmDevice } | undefined;
 
   typeControl = new FormControl(VmDeviceType.Cdrom, Validators.required);
   orderControl = new FormControl(null as number | null);
@@ -241,10 +241,11 @@ export class DeviceFormComponent implements OnInit {
     private formErrorHandler: FormErrorHandlerService,
     private cdr: ChangeDetectorRef,
     private dialogService: DialogService,
-    private slideInRef: OldSlideInRef<DeviceFormComponent>,
     private errorHandler: ErrorHandlerService,
-    @Inject(SLIDE_IN_DATA) private slideInData: { virtualMachineId: number; device: VmDevice },
-  ) {}
+    public slideInRef: SlideInRef<{ virtualMachineId?: number; device?: VmDevice } | undefined, boolean>,
+  ) {
+    this.slideInData = slideInRef.getData();
+  }
 
   ngOnInit(): void {
     this.usbForm.controls.usb.disable();
@@ -256,12 +257,12 @@ export class DeviceFormComponent implements OnInit {
       }
     });
 
-    if (this.slideInData.virtualMachineId) {
+    if (this.slideInData?.virtualMachineId) {
       this.virtualMachineId = this.slideInData.virtualMachineId;
       this.setVirtualMachineId();
     }
 
-    if (this.slideInData.device) {
+    if (this.slideInData?.device) {
       this.existingDevice = this.slideInData.device;
       this.setDeviceForEdit();
     }
@@ -385,7 +386,7 @@ export class DeviceFormComponent implements OnInit {
           }
           this.isLoading = false;
           this.cdr.markForCheck();
-          this.slideInRef.close(true);
+          this.slideInRef.close({ response: true, error: null });
         },
         error: (error: unknown) => {
           this.formErrorHandler.handleValidationErrors(error, this.typeSpecificForm);
diff --git a/src/app/pages/vm/devices/device-list/device-list/device-list.component.spec.ts b/src/app/pages/vm/devices/device-list/device-list/device-list.component.spec.ts
index 963d24a3385..70eb10072b4 100644
--- a/src/app/pages/vm/devices/device-list/device-list/device-list.component.spec.ts
+++ b/src/app/pages/vm/devices/device-list/device-list/device-list.component.spec.ts
@@ -15,6 +15,7 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl
 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 { PageHeaderComponent } from 'app/modules/page-header/page-title-header/page-header.component';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { DeviceFormComponent } from 'app/pages/vm/devices/device-form/device-form.component';
 import {
@@ -22,7 +23,6 @@ import {
 } from 'app/pages/vm/devices/device-list/device-delete-modal/device-delete-modal.component';
 import { DeviceDetailsComponent } from 'app/pages/vm/devices/device-list/device-details/device-details.component';
 import { DeviceListComponent } from 'app/pages/vm/devices/device-list/device-list/device-list.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 describe('DeviceListComponent', () => {
   let spectator: Spectator<DeviceListComponent>;
@@ -63,10 +63,8 @@ describe('DeviceListComponent', () => {
         mockCall('vm.device.query', devices),
       ]),
       mockAuth(),
-      mockProvider(OldSlideInService, {
-        open: jest.fn(() => {
-          return { slideInClosed$: of() };
-        }),
+      mockProvider(SlideIn, {
+        open: jest.fn(() => of()),
       }),
       mockProvider(MatDialog, {
         open: jest.fn(() => ({
@@ -102,7 +100,7 @@ describe('DeviceListComponent', () => {
     const menu = await loader.getHarness(MatMenuHarness);
     await menu.clickItem({ text: 'Edit' });
 
-    expect(spectator.inject(OldSlideInService).open).toHaveBeenCalledWith(DeviceFormComponent, {
+    expect(spectator.inject(SlideIn).open).toHaveBeenCalledWith(DeviceFormComponent, {
       data: {
         device: devices[0],
         virtualMachineId: 76,
diff --git a/src/app/pages/vm/devices/device-list/device-list/device-list.component.ts b/src/app/pages/vm/devices/device-list/device-list/device-list.component.ts
index 3e42f1b4ec7..229de1c5d05 100644
--- a/src/app/pages/vm/devices/device-list/device-list/device-list.component.ts
+++ b/src/app/pages/vm/devices/device-list/device-list/device-list.component.ts
@@ -30,6 +30,7 @@ import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-
 import { SortDirection } from 'app/modules/ix-table/enums/sort-direction.enum';
 import { createTable } from 'app/modules/ix-table/utils';
 import { PageHeaderComponent } from 'app/modules/page-header/page-title-header/page-header.component';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { DeviceFormComponent } from 'app/pages/vm/devices/device-form/device-form.component';
@@ -37,7 +38,6 @@ import {
   DeviceDeleteModalComponent,
 } from 'app/pages/vm/devices/device-list/device-delete-modal/device-delete-modal.component';
 import { DeviceDetailsComponent } from 'app/pages/vm/devices/device-list/device-details/device-details.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 @UntilDestroy()
 @Component({
@@ -101,7 +101,7 @@ export class DeviceListComponent implements OnInit {
   constructor(
     private api: ApiService,
     private translate: TranslateService,
-    private slideInService: OldSlideInService,
+    private slideIn: SlideIn,
     private cdr: ChangeDetectorRef,
     protected emptyService: EmptyService,
     private matDialog: MatDialog,
@@ -126,29 +126,30 @@ export class DeviceListComponent implements OnInit {
   }
 
   onAdd(): void {
-    this.slideInService.open(DeviceFormComponent, {
+    this.slideIn.open(DeviceFormComponent, {
       data: {
         virtualMachineId: this.vmId,
       },
-    })
-      .slideInClosed$.pipe(filter(Boolean), untilDestroyed(this))
-      .subscribe(() => {
-        this.loadDevices();
-      });
+    }).pipe(
+      filter((response) => !!response.response),
+      untilDestroyed(this),
+    ).subscribe(() => {
+      this.loadDevices();
+    });
   }
 
   onEdit(device: VmDevice): void {
-    this.slideInService.open(DeviceFormComponent, {
+    this.slideIn.open(DeviceFormComponent, {
       data: {
         device,
         virtualMachineId: this.vmId,
       },
-    })
-      .slideInClosed$
-      .pipe(filter(Boolean), untilDestroyed(this))
-      .subscribe(() => {
-        this.loadDevices();
-      });
+    }).pipe(
+      filter((response) => !!response.response),
+      untilDestroyed(this),
+    ).subscribe(() => {
+      this.loadDevices();
+    });
   }
 
   onDelete(device: VmDevice): void {
diff --git a/src/app/pages/vm/vm-list.component.spec.ts b/src/app/pages/vm/vm-list.component.spec.ts
index 723637c8963..aaf6373d0ca 100644
--- a/src/app/pages/vm/vm-list.component.spec.ts
+++ b/src/app/pages/vm/vm-list.component.spec.ts
@@ -17,9 +17,9 @@ import {
 import { IxTableDetailsRowDirective } from 'app/modules/ix-table/directives/ix-table-details-row.directive';
 import { PageHeaderComponent } from 'app/modules/page-header/page-title-header/page-header.component';
 import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { VmListComponent } from 'app/pages/vm/vm-list.component';
 import { VmWizardComponent } from 'app/pages/vm/vm-wizard/vm-wizard.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 import { SystemGeneralService } from 'app/services/system-general.service';
 import { VmService } from 'app/services/vm.service';
 
@@ -74,11 +74,8 @@ describe('VmListComponent', () => {
         getAvailableMemory: jest.fn(() => of(4096)),
         hasVirtualizationSupport$: of(true),
       }),
-      mockProvider(OldSlideInService, {
-        open: jest.fn(() => {
-          return { slideInClosed$: of(true) };
-        }),
-        onClose$: of(),
+      mockProvider(SlideIn, {
+        open: jest.fn(() => of()),
       }),
     ],
   });
@@ -104,6 +101,6 @@ describe('VmListComponent', () => {
     const addButton = await loader.getHarness(MatButtonHarness.with({ text: 'Add' }));
     await addButton.click();
 
-    expect(spectator.inject(OldSlideInService).open).toHaveBeenCalledWith(VmWizardComponent);
+    expect(spectator.inject(SlideIn).open).toHaveBeenCalledWith(VmWizardComponent);
   });
 });
diff --git a/src/app/pages/vm/vm-list.component.ts b/src/app/pages/vm/vm-list.component.ts
index a339e302e67..83a604767d8 100644
--- a/src/app/pages/vm/vm-list.component.ts
+++ b/src/app/pages/vm/vm-list.component.ts
@@ -43,12 +43,12 @@ import { createTable } from 'app/modules/ix-table/utils';
 import { WithLoadingStateDirective } from 'app/modules/loader/directives/with-loading-state/with-loading-state.directive';
 import { PageHeaderComponent } from 'app/modules/page-header/page-title-header/page-header.component';
 import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
 import { TestDirective } from 'app/modules/test-id/test.directive';
 import { ApiService } from 'app/modules/websocket/api.service';
 import { VirtualMachineDetailsRowComponent } from 'app/pages/vm/vm-list/vm-details-row/vm-details-row.component';
 import { vmListElements } from 'app/pages/vm/vm-list.elements';
 import { VmWizardComponent } from 'app/pages/vm/vm-wizard/vm-wizard.component';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 import { SystemGeneralService } from 'app/services/system-general.service';
 import { VmService } from 'app/services/vm.service';
 
@@ -179,7 +179,7 @@ export class VmListComponent implements OnInit {
   }
 
   constructor(
-    private slideInService: OldSlideInService,
+    private slideIn: SlideIn,
     private systemGeneralService: SystemGeneralService,
     private translate: TranslateService,
     private api: ApiService,
@@ -215,10 +215,11 @@ export class VmListComponent implements OnInit {
   }
 
   doAdd(): void {
-    const slideInRef = this.slideInService.open(VmWizardComponent);
-    slideInRef.slideInClosed$
-      .pipe(filter(Boolean), untilDestroyed(this))
-      .subscribe(() => {
+    this.slideIn.open(VmWizardComponent)
+      .pipe(
+        filter((response) => !!response.response),
+        untilDestroyed(this),
+      ).subscribe(() => {
         this.vmService.checkMemory();
         this.refresh();
       });
diff --git a/src/app/pages/vm/vm-wizard/vm-wizard.component.html b/src/app/pages/vm/vm-wizard/vm-wizard.component.html
index 9f586db5fe7..ce4f4cdd5b6 100644
--- a/src/app/pages/vm/vm-wizard/vm-wizard.component.html
+++ b/src/app/pages/vm/vm-wizard/vm-wizard.component.html
@@ -1,8 +1,8 @@
-<ix-old-modal-header
+<ix-modal-header
   [requiredRoles]="requiredRoles"
   [title]="'Create Virtual Machine' | translate"
   [loading]="isLoading"
-></ix-old-modal-header>
+></ix-modal-header>
 
 <mat-card>
   <mat-card-content>
diff --git a/src/app/pages/vm/vm-wizard/vm-wizard.component.spec.ts b/src/app/pages/vm/vm-wizard/vm-wizard.component.spec.ts
index 502510a533b..2e6acd8d141 100644
--- a/src/app/pages/vm/vm-wizard/vm-wizard.component.spec.ts
+++ b/src/app/pages/vm/vm-wizard/vm-wizard.component.spec.ts
@@ -15,8 +15,8 @@ import {
 } from 'app/enums/vm.enum';
 import { VirtualMachine, VmPortWizardResult } from 'app/interfaces/virtual-machine.interface';
 import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
-import { SLIDE_IN_DATA } from 'app/modules/slide-ins/slide-in.token';
+import { SlideIn } from 'app/modules/slide-ins/slide-in';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service';
 import { SummaryComponent } from 'app/modules/summary/summary.component';
 import { ApiService } from 'app/modules/websocket/api.service';
@@ -38,7 +38,6 @@ import { VmWizardComponent } from 'app/pages/vm/vm-wizard/vm-wizard.component';
 import { FilesystemService } from 'app/services/filesystem.service';
 import { GpuService } from 'app/services/gpu/gpu.service';
 import { IsolatedGpuValidatorService } from 'app/services/gpu/isolated-gpu-validator.service';
-import { OldSlideInService } from 'app/services/old-slide-in.service';
 
 describe('VmWizardComponent', () => {
   let spectator: Spectator<VmWizardComponent>;
@@ -46,6 +45,12 @@ describe('VmWizardComponent', () => {
   let form: IxFormHarness;
   let nextButton: MatStepperNextHarness;
 
+  const slideInRef: SlideInRef<undefined, unknown> = {
+    close: jest.fn(),
+    requireConfirmationWhen: jest.fn(),
+    getData: jest.fn(() => undefined),
+  };
+
   const createComponent = createComponentFactory({
     component: VmWizardComponent,
     imports: [
@@ -63,7 +68,9 @@ describe('VmWizardComponent', () => {
       MockComponent(SummaryComponent),
     ],
     providers: [
-      mockProvider(OldSlideInService),
+      mockProvider(SlideIn, {
+        components$: of([]),
+      }),
       mockProvider(GpuService),
       mockProvider(VmGpuService),
       mockAuth(),
@@ -122,8 +129,7 @@ describe('VmWizardComponent', () => {
       mockProvider(VmGpuService, {
         updateVmGpus: jest.fn(() => of(undefined)),
       }),
-      mockProvider(OldSlideInRef),
-      { provide: SLIDE_IN_DATA, useValue: undefined },
+      mockProvider(SlideInRef, slideInRef),
     ],
   });
 
@@ -333,6 +339,6 @@ describe('VmWizardComponent', () => {
       ['0000:03:00.0'],
     );
     expect(spectator.inject(VmGpuService).updateVmGpus).toHaveBeenCalledWith({ id: 4 }, ['0000:03:00.0']);
-    expect(spectator.inject(OldSlideInRef).close).toHaveBeenCalled();
+    expect(spectator.inject(SlideInRef).close).toHaveBeenCalled();
   });
 });
diff --git a/src/app/pages/vm/vm-wizard/vm-wizard.component.ts b/src/app/pages/vm/vm-wizard/vm-wizard.component.ts
index da666895519..6fa33451b82 100644
--- a/src/app/pages/vm/vm-wizard/vm-wizard.component.ts
+++ b/src/app/pages/vm/vm-wizard/vm-wizard.component.ts
@@ -24,8 +24,8 @@ import { FormActionsComponent } from 'app/modules/forms/ix-forms/components/form
 import {
   UseIxIconsInStepperComponent,
 } from 'app/modules/ix-icon/use-ix-icons-in-stepper/use-ix-icons-in-stepper.component';
-import { OldModalHeaderComponent } from 'app/modules/slide-ins/components/old-modal-header/old-modal-header.component';
-import { OldSlideInRef } from 'app/modules/slide-ins/old-slide-in-ref';
+import { ModalHeaderComponent } from 'app/modules/slide-ins/components/modal-header/modal-header.component';
+import { SlideInRef } from 'app/modules/slide-ins/slide-in-ref';
 import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service';
 import { SummaryComponent } from 'app/modules/summary/summary.component';
 import { SummarySection } from 'app/modules/summary/summary.interface';
@@ -54,7 +54,7 @@ import { GpuService } from 'app/services/gpu/gpu.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    OldModalHeaderComponent,
+    ModalHeaderComponent,
     MatCard,
     MatCardContent,
     MatStepper,
@@ -119,12 +119,12 @@ export class VmWizardComponent implements OnInit {
     private cdr: ChangeDetectorRef,
     private translate: TranslateService,
     private dialogService: DialogService,
-    private slideInRef: OldSlideInRef<VmWizardComponent>,
     private api: ApiService,
     private errorHandler: ErrorHandlerService,
     private gpuService: GpuService,
     private vmGpuService: VmGpuService,
     private snackbar: SnackbarService,
+    public slideInRef: SlideInRef<undefined, boolean>,
   ) {}
 
   ngOnInit(): void {
@@ -155,7 +155,7 @@ export class VmWizardComponent implements OnInit {
       .subscribe({
         next: () => {
           this.isLoading = false;
-          this.slideInRef.close(true);
+          this.slideInRef.close({ response: true, error: null });
           this.snackbar.success(this.translate.instant('Virtual machine created'));
           this.cdr.markForCheck();
         },