From 183030188a2e5a70f20efc20d8499f8a9a936151 Mon Sep 17 00:00:00 2001
From: Annemieke Verdenhalven <annemieke.verdenhalven@fit.fraunhofer.de>
Date: Mon, 5 Aug 2024 11:32:01 +0200
Subject: [PATCH 1/5] internationalize the UI and add German and English
 localizations

---
 CHANGELOG.md                                  |   2 +
 package-lock.json                             |  43 +++
 package.json                                  |   2 +
 src/app/app.module.ts                         |  32 +-
 .../asset-detail-dialog-data.service.ts       |  11 +-
 .../asset-detail-dialog.component.html        |  29 +-
 .../asset-detail-dialog.component.ts          |  10 +-
 .../asset-property-grid-group-builder.ts      | 112 ++++---
 .../markdown-description.component.html       |  15 +-
 .../policy-property-field-builder.ts          |  14 +-
 .../catalog/catalog.module.ts                 |   8 +
 .../contract-offer-mini-list.component.html   |  24 +-
 .../transfer-history-mini-list.component.html |   9 +-
 ...truncated-short-description.component.html |  10 +-
 .../confirmation-dialog.module.ts             |   9 +-
 .../confirmation-dialog.component.ts          |  22 +-
 ...e-negotiation-confirm-tos-dialog.module.ts |   3 +-
 ...otiation-confirm-tos-dialog.component.html |  14 +-
 .../json-dialog/json-dialog.module.ts         |   9 +-
 .../json-dialog/json-dialog.component.html    |  13 +-
 .../ui-elements/ago/ago.pipe.ts               |  11 +-
 .../ui-elements/ago/formatDateAgo.ts          |  15 +-
 .../url-list-dialog/url-list-dialog.module.ts |   9 +-
 .../url-list-dialog.component.html            |  13 +-
 ...nector-info-property-grid-group-builder.ts |  43 ++-
 .../services/contract-negotiation.service.ts  |  17 +-
 src/app/core/services/page-title-strategy.ts  |  30 ++
 .../services/participant-id-localization.ts   |  27 +-
 .../asset-page/asset-page.module.ts           |   9 +-
 .../asset-page/asset-page.component.html      |  13 +-
 ...browser-fetch-detail-dialog.component.html |  23 +-
 .../catalog-browser-page.module.ts            |   9 +-
 .../catalog-browser-page.component.html       |  27 +-
 .../catalog-browser-page.component.ts         |  15 +-
 .../data-offer-builder.ts                     |  13 +-
 .../connector-ui-routing.module.ts            |   6 +
 .../connector-ui/connector-ui.component.html  |  10 +-
 .../connector-ui/connector-ui.component.scss  |  18 ++
 .../connector-ui/connector-ui.component.ts    |  10 +
 .../connector-ui/connector-ui.module.ts       |  20 +-
 .../contract-agreement-cards.component.html   |  15 +-
 .../contract-agreement-page.module.ts         |   9 +-
 .../contract-agreement-page.component.html    |  23 +-
 ...t-agreement-transfer-dialog.component.html | 140 ++++++---
 .../contract-definition-cards.component.html  |  17 +-
 .../contract-definition-cards.component.ts    |   9 +
 ...ct-definition-editor-dialog.component.html |  19 +-
 .../contract-definition-page.module.ts        |   9 +-
 .../contract-definition-page.component.html   |  15 +-
 .../dashboard-page/dashboard-page.module.ts   |   9 +-
 .../dashboard-page-data.service.ts            |  57 +++-
 .../dashboard-page.component.html             | 192 ++++++++----
 .../language-selector.component.html          |  33 ++
 .../language-selector.component.scss          |  16 +
 .../language-selector.component.spec.ts       |  26 ++
 .../language-selector.component.ts            |  36 +++
 ...policy-definition-create-page.component.ts |  15 +-
 .../policy-cards/policy-cards.component.html  |   9 +-
 .../policy-cards/policy-cards.component.ts    |  18 +-
 .../policy-definition-page.module.ts          |   8 +
 .../policy-definition-page.component.html     |  17 +-
 .../transfer-history-page.module.ts           |   8 +
 .../transfer-history-page.component.html      |  29 +-
 .../transfer-history-page.component.ts        |  17 +-
 src/assets/i18n/de.json                       | 294 ++++++++++++++++++
 src/assets/i18n/en.json                       | 294 ++++++++++++++++++
 src/assets/images/flags/de.svg                |   9 +
 src/assets/images/flags/en.svg                |  16 +
 68 files changed, 1781 insertions(+), 307 deletions(-)
 create mode 100644 src/app/core/services/page-title-strategy.ts
 create mode 100644 src/app/routes/connector-ui/language-selector/language-selector.component.html
 create mode 100644 src/app/routes/connector-ui/language-selector/language-selector.component.scss
 create mode 100644 src/app/routes/connector-ui/language-selector/language-selector.component.spec.ts
 create mode 100644 src/app/routes/connector-ui/language-selector/language-selector.component.ts
 create mode 100644 src/assets/i18n/de.json
 create mode 100644 src/assets/i18n/en.json
 create mode 100644 src/assets/images/flags/de.svg
 create mode 100644 src/assets/images/flags/en.svg

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08e734ca7..2e898a84c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,8 @@ the detailed section referring to by linking pull requests or issues.
 
 #### Major
 
+- Internationalize the UI and add a German localization
+
 #### Minor
 
 #### Patch
diff --git a/package-lock.json b/package-lock.json
index 05e1ccd51..9338c4044 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,6 +21,8 @@
         "@angular/platform-browser-dynamic": "^14.3.0",
         "@angular/router": "^14.3.0",
         "@ng-apimock/core": "^3.11.0",
+        "@ngx-translate/core": "^14.0.0",
+        "@ngx-translate/http-loader": "^7.0.0",
         "@ngxs/store": "^3.8.1",
         "@sovity.de/edc-client": "0.20240719.91939-main-f62d9761",
         "clean-deep": "^3.4.0",
@@ -3351,6 +3353,31 @@
         "webpack": "^5.54.0"
       }
     },
+    "node_modules/@ngx-translate/core": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-14.0.0.tgz",
+      "integrity": "sha512-UevdwNCXMRCdJv//0kC8h2eSfmi02r29xeE8E9gJ1Al4D4jEJ7eiLPdjslTMc21oJNGguqqWeEVjf64SFtvw2w==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=13.0.0",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/@ngx-translate/http-loader": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-7.0.0.tgz",
+      "integrity": "sha512-j+NpXXlcGVdyUNyY/qsJrqqeAdJdizCd+GKh3usXExSqy1aE9866jlAIL+xrfDU4w+LiMoma5pgE4emvFebZmA==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=13.0.0",
+        "@ngx-translate/core": ">=14.0.0",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
     "node_modules/@ngxs/store": {
       "version": "3.8.1",
       "resolved": "https://registry.npmjs.org/@ngxs/store/-/store-3.8.1.tgz",
@@ -16478,6 +16505,22 @@
       "dev": true,
       "requires": {}
     },
+    "@ngx-translate/core": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-14.0.0.tgz",
+      "integrity": "sha512-UevdwNCXMRCdJv//0kC8h2eSfmi02r29xeE8E9gJ1Al4D4jEJ7eiLPdjslTMc21oJNGguqqWeEVjf64SFtvw2w==",
+      "requires": {
+        "tslib": "^2.3.0"
+      }
+    },
+    "@ngx-translate/http-loader": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-7.0.0.tgz",
+      "integrity": "sha512-j+NpXXlcGVdyUNyY/qsJrqqeAdJdizCd+GKh3usXExSqy1aE9866jlAIL+xrfDU4w+LiMoma5pgE4emvFebZmA==",
+      "requires": {
+        "tslib": "^2.3.0"
+      }
+    },
     "@ngxs/store": {
       "version": "3.8.1",
       "resolved": "https://registry.npmjs.org/@ngxs/store/-/store-3.8.1.tgz",
diff --git a/package.json b/package.json
index 677dc2a24..72d8cbaa1 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,8 @@
     "@angular/platform-browser-dynamic": "^14.3.0",
     "@angular/router": "^14.3.0",
     "@ng-apimock/core": "^3.11.0",
+    "@ngx-translate/core": "^14.0.0",
+    "@ngx-translate/http-loader": "^7.0.0",
     "@ngxs/store": "^3.8.1",
     "@sovity.de/edc-client": "0.20240719.91939-main-f62d9761",
     "clean-deep": "^3.4.0",
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 945a31482..a84fa5ebc 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,4 +1,14 @@
-import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http';
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
+import {
+  HTTP_INTERCEPTORS,
+  HttpClient,
+  HttpClientModule,
+} from '@angular/common/http';
 import {NgModule} from '@angular/core';
 import {MatButtonModule} from '@angular/material/button';
 import {MatCardModule} from '@angular/material/card';
@@ -21,6 +31,9 @@ import {
 } from '@angular/material/tooltip';
 import {BrowserModule} from '@angular/platform-browser';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
+import {TitleStrategy} from '@angular/router';
+import {TranslateLoader, TranslateModule} from '@ngx-translate/core';
+import {TranslateHttpLoader} from '@ngx-translate/http-loader';
 import {NgxsModule} from '@ngxs/store';
 import {NgChartsModule} from 'ng2-charts';
 import {AppRoutingModule} from './app-routing.module';
@@ -28,7 +41,11 @@ import {AppComponent} from './app.component';
 import {PageNotFoundComponent} from './component-library/error-404-component/page-not-found.component';
 import {provideAppConfig} from './core/config/app-config-initializer';
 import {ApiKeyInterceptor} from './core/services/api/api-key.interceptor';
+import {CustomPageTitleStrategy} from './core/services/page-title-strategy';
 
+export function HttploaderFactory(http: HttpClient) {
+  return new TranslateHttpLoader(http);
+}
 @NgModule({
   imports: [
     // Angular
@@ -48,6 +65,15 @@ import {ApiKeyInterceptor} from './core/services/api/api-key.interceptor';
     MatSnackBarModule,
     MatToolbarModule,
 
+    //Translation
+    TranslateModule.forRoot({
+      loader: {
+        provide: TranslateLoader,
+        useFactory: HttploaderFactory,
+        deps: [HttpClient],
+      },
+    }),
+
     // NgXs
     NgxsModule.forRoot([]),
 
@@ -59,10 +85,11 @@ import {ApiKeyInterceptor} from './core/services/api/api-key.interceptor';
   ],
   declarations: [AppComponent, PageNotFoundComponent],
   providers: [
+    HttpClient,
     provideAppConfig(),
 
     {provide: HTTP_INTERCEPTORS, multi: true, useClass: ApiKeyInterceptor},
-
+    {provide: TitleStrategy, useClass: CustomPageTitleStrategy},
     {provide: MAT_DATE_LOCALE, useValue: 'en-GB'},
     {
       provide: MAT_FORM_FIELD_DEFAULT_OPTIONS,
@@ -80,5 +107,6 @@ import {ApiKeyInterceptor} from './core/services/api/api-key.interceptor';
     },
   ],
   bootstrap: [AppComponent],
+  exports: [TranslateModule],
 })
 export class AppModule {}
diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.service.ts b/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.service.ts
index 7cef5f1d4..93e956d06 100644
--- a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.service.ts
+++ b/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.service.ts
@@ -1,4 +1,12 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
+
 import {Injectable} from '@angular/core';
+import {TranslateService} from '@ngx-translate/core';
 import {DataOffer} from '../../../core/services/models/data-offer';
 import {UiAssetMapped} from '../../../core/services/models/ui-asset-mapped';
 import {ContractAgreementCardMapped} from '../../../routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-card-mapped';
@@ -12,6 +20,7 @@ import {AssetPropertyGridGroupBuilder} from './asset-property-grid-group-builder
 export class AssetDetailDialogDataService {
   constructor(
     private assetPropertyGridGroupBuilder: AssetPropertyGridGroupBuilder,
+    private translateService: TranslateService,
   ) {}
 
   assetDetailsReadonly(asset: UiAssetMapped): AssetDetailDialogData {
@@ -85,7 +94,7 @@ export class AssetDetailDialogDataService {
       ),
       this.assetPropertyGridGroupBuilder.buildAssetPropertiesGroup(
         asset,
-        'Asset',
+        this.translateService.instant('general.asset'),
       ),
       ...this.assetPropertyGridGroupBuilder.buildAdditionalPropertiesGroups(
         asset,
diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.html b/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.html
index 0c2d1f19d..8d178e40d 100644
--- a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.html
+++ b/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.html
@@ -1,3 +1,10 @@
+<!--
+  ~ Copyright (c) 2021-2024. sovity GmbH
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
 <div class="flex flex-row justify-between space-x-[10px]">
   <div class="mat-card-header" mat-dialog-title removeClass="mat-dialog-title">
     <mat-icon
@@ -39,14 +46,14 @@
     <button
       *ngIf="data.showEditButton"
       mat-icon-button
-      matTooltip="Edit"
+      matTooltip="{{ 'general.edit' | translate }}"
       (click)="onEditClick()">
       <mat-icon class="mat-icon-[22px]">edit</mat-icon>
     </button>
     <button
       *ngIf="data.showDeleteButton"
       mat-icon-button
-      matTooltip="Delete"
+      matTooltip="{{ 'general.delete' | translate }}"
       (click)="onDeleteClick()">
       <mat-icon class="mat-icon-[22px]">delete</mat-icon>
     </button>
@@ -122,7 +129,7 @@
     <div
       class="flex flex-row flex-wrap property-grid-group-title"
       [style.margin-top.px]="30">
-      Transfer History
+      {{ 'component_library.t_history' | translate }}
     </div>
     <transfer-history-mini-list [contractAgreement]="data.contractAgreement!!">
     </transfer-history-mini-list>
@@ -171,7 +178,7 @@
 
     <div class="flex gap-1 items-center">
       <button mat-stroked-button [mat-dialog-close]="null" [disabled]="loading">
-        Close
+        {{ 'general.close' | translate }}
       </button>
 
       <ng-container
@@ -180,8 +187,8 @@
           *ngIf="data.asset.isOwnConnector"
           disabled
           mat-raised-button
-          matTooltip="Cannot negotiate contracts with your own connector.">
-          Negotiate
+          matTooltip="{{ 'tooltip.negotiate' | translate }}">
+          {{ 'component_library.negotiate' | translate }}
         </button>
 
         <button
@@ -199,12 +206,14 @@
             )
           "
           (click)="onNegotiateClick(data.dataOffer!.contractOffers[0])">
-          <ng-container *ngSwitchCase="'ready'">Negotiate</ng-container>
+          <ng-container *ngSwitchCase="'ready'">{{
+            'component_library.negotiate' | translate
+          }}</ng-container>
           <ng-container *ngSwitchCase="'negotiating'">
-            Negotiating...
+            {{ 'component_library.negotiating' | translate }}
           </ng-container>
           <ng-container *ngSwitchCase="'negotiated'">
-            Successfully Negotiated
+            {{ 'component_library.succ_negotiating' | translate }}
           </ng-container>
         </button>
       </ng-container>
@@ -229,7 +238,7 @@
         [matTooltip]="data.contractAgreement?.statusTooltipText ?? ''"
         [disabled]="!data.contractAgreement?.canTransfer"
         (click)="onTransferClick()">
-        Transfer
+        {{ 'component_library.transfer' | translate }}
       </button>
     </div>
   </div>
diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.ts b/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.ts
index 54e0c69ac..f3e45e493 100644
--- a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.ts
+++ b/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.ts
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {DOCUMENT} from '@angular/common';
 import {Component, Inject, OnDestroy} from '@angular/core';
 import {
@@ -7,6 +13,7 @@ import {
 } from '@angular/material/dialog';
 import {Observable, Subject, isObservable} from 'rxjs';
 import {filter, finalize, takeUntil} from 'rxjs/operators';
+import {TranslateService} from '@ngx-translate/core';
 import {UiContractOffer} from '@sovity.de/edc-client';
 import {MailtoLinkBuilder} from 'src/app/core/services/mailto-link-builder';
 import {EdcApiService} from '../../../core/services/api/edc-api.service';
@@ -85,6 +92,7 @@ export class AssetDetailDialogComponent implements OnDestroy {
     public contractNegotiationService: ContractNegotiationService,
     private mailtoLinkBuilder: MailtoLinkBuilder,
     @Inject(DOCUMENT) private document: Document,
+    private translateService: TranslateService,
   ) {
     if (isObservable(this._data)) {
       this._data
@@ -180,7 +188,7 @@ export class AssetDetailDialogComponent implements OnDestroy {
   }
 
   private confirmDelete(): Observable<boolean> {
-    const dialogData = ConfirmDialogModel.forDelete('asset', this.asset.title);
+    const dialogData = ConfirmDialogModel.forDelete('asset', this.asset.title, this.translateService);
     const ref = this.matDialog.open(ConfirmationDialogComponent, {
       maxWidth: '20%',
       data: dialogData,
diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts b/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts
index c6e3fbae3..af62fe918 100644
--- a/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts
+++ b/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts
@@ -1,4 +1,11 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {Injectable} from '@angular/core';
+import {TranslateService} from '@ngx-translate/core';
 import {UiPolicy} from '@sovity.de/edc-client';
 import {ActiveFeatureSet} from '../../../core/config/active-feature-set';
 import {UiAssetMapped} from '../../../core/services/models/ui-asset-mapped';
@@ -13,11 +20,12 @@ import {PolicyPropertyFieldBuilder} from './policy-property-field-builder';
 @Injectable()
 export class AssetPropertyGridGroupBuilder {
   constructor(
-    private participantIdLocalization: ParticipantIdLocalization,
     private activeFeatureSet: ActiveFeatureSet,
     private propertyGridUtils: PropertyGridFieldService,
     private urlListDialogService: UrlListDialogService,
     private policyPropertyFieldBuilder: PolicyPropertyFieldBuilder,
+    private translateService: TranslateService,
+    private participantIdLocalization: ParticipantIdLocalization,
   ) {}
 
   buildAssetPropertiesGroup(
@@ -37,32 +45,34 @@ export class AssetPropertyGridGroupBuilder {
       },
       {
         icon: 'language',
-        label: 'Language',
+        label: this.translateService.instant('general.language'),
         ...this.propertyGridUtils.guessValue(asset.language?.label),
       },
       {
         icon: 'apartment',
-        label: 'Publisher',
+        label: this.translateService.instant('general.publisher'),
         ...this.propertyGridUtils.guessValue(asset.publisherHomepage),
       },
       {
         icon: 'bookmarks',
-        label: 'Endpoint Documentation',
+        label: this.translateService.instant('general.endpoint_doc'),
         ...this.propertyGridUtils.guessValue(asset.landingPageUrl),
       },
       {
         icon: 'gavel',
-        label: 'Standard License',
+        label: this.translateService.instant('general.st_license'),
         ...this.propertyGridUtils.guessValue(asset.licenseUrl),
       },
       {
         icon: 'category',
-        label: this.participantIdLocalization.participantId,
+        label: this.translateService.instant(
+          'component_library.participant_id',
+        ),
         ...this.propertyGridUtils.guessValue(asset.participantId),
       },
       {
         icon: 'account_circle',
-        label: 'Organization',
+        label: this.translateService.instant('component_library.organization'),
         ...this.propertyGridUtils.guessValue(asset.creatorOrganizationName),
       },
       this.buildConnectorEndpointField(asset.connectorEndpoint),
@@ -83,10 +93,22 @@ export class AssetPropertyGridGroupBuilder {
     const fields: PropertyGridField[] = [];
 
     const hints: {label: string; value: boolean | undefined}[] = [
-      {label: 'Method', value: asset.httpDatasourceHintsProxyMethod},
-      {label: 'Path', value: asset.httpDatasourceHintsProxyPath},
-      {label: 'Query Params', value: asset.httpDatasourceHintsProxyQueryParams},
-      {label: 'Body', value: asset.httpDatasourceHintsProxyBody},
+      {
+        label: this.translateService.instant('general.method'),
+        value: asset.httpDatasourceHintsProxyMethod,
+      },
+      {
+        label: this.translateService.instant('general.path'),
+        value: asset.httpDatasourceHintsProxyPath,
+      },
+      {
+        label: this.translateService.instant('general.params'),
+        value: asset.httpDatasourceHintsProxyQueryParams,
+      },
+      {
+        label: this.translateService.instant('general.body'),
+        value: asset.httpDatasourceHintsProxyBody,
+      },
     ];
 
     if (hints.some((hint) => hint.value != null)) {
@@ -99,7 +121,7 @@ export class AssetPropertyGridGroupBuilder {
 
       fields.push({
         icon: 'api',
-        label: 'HTTP Data Source Parameterization',
+        label: this.translateService.instant('component_library.http_param'),
         text,
       });
     }
@@ -107,7 +129,7 @@ export class AssetPropertyGridGroupBuilder {
     if (asset.mediaType) {
       fields.push({
         icon: 'category',
-        label: 'Content Type',
+        label: this.translateService.instant('general.content'),
         ...this.propertyGridUtils.guessValue(asset.mediaType),
       });
     }
@@ -151,7 +173,7 @@ export class AssetPropertyGridGroupBuilder {
 
     return [
       {
-        groupLabel: 'Additional Properties',
+        groupLabel: this.translateService.instant('general.add_properties'),
         properties: additionalProperties,
       },
       {
@@ -170,42 +192,42 @@ export class AssetPropertyGridGroupBuilder {
     if (asset.transportMode) {
       fields.push({
         icon: 'commute',
-        label: 'Transport Mode',
+        label: this.translateService.instant('general.transport'),
         ...this.propertyGridUtils.guessValue(asset.transportMode?.label),
       });
     }
     if (asset.dataCategory) {
       fields.push({
         icon: 'commute',
-        label: 'Data Category',
+        label: this.translateService.instant('general.category'),
         ...this.propertyGridUtils.guessValue(asset.dataCategory?.label),
       });
     }
     if (asset.dataSubcategory) {
       fields.push({
         icon: 'commute',
-        label: 'Data Subcategory',
+        label: this.translateService.instant('general.subcategory'),
         ...this.propertyGridUtils.guessValue(asset.dataSubcategory?.label),
       });
     }
     if (asset.dataModel) {
       fields.push({
         icon: 'category',
-        label: 'Data Model',
+        label: this.translateService.instant('general.model'),
         ...this.propertyGridUtils.guessValue(asset.dataModel),
       });
     }
     if (asset.geoReferenceMethod) {
       fields.push({
         icon: 'commute',
-        label: 'Geo Reference Method',
+        label: this.translateService.instant('general.geo_method'),
         ...this.propertyGridUtils.guessValue(asset.geoReferenceMethod),
       });
     }
     if (asset.geoLocation) {
       fields.push({
         icon: 'location_on',
-        label: 'Geo Location',
+        label: this.translateService.instant('general.geo_location'),
         ...this.propertyGridUtils.guessValue(asset.geoLocation),
       });
     }
@@ -215,7 +237,7 @@ export class AssetPropertyGridGroupBuilder {
     if (asset.sovereignLegalName) {
       fields.push({
         icon: 'account_balance',
-        label: 'Sovereign',
+        label: this.translateService.instant('general.sovereign'),
         ...this.propertyGridUtils.guessValue(asset.sovereignLegalName),
       });
     }
@@ -236,21 +258,21 @@ export class AssetPropertyGridGroupBuilder {
     if (asset.conditionsForUse) {
       fields.push({
         icon: 'description',
-        label: 'Conditions For Use',
+        label: this.translateService.instant('general.conditions'),
         ...this.propertyGridUtils.guessValue(asset.conditionsForUse),
       });
     }
     if (asset.dataUpdateFrequency) {
       fields.push({
         icon: 'timelapse',
-        label: 'Data Update Frequency',
+        label: this.translateService.instant('general.frequency'),
         ...this.propertyGridUtils.guessValue(asset.dataUpdateFrequency),
       });
     }
     if (asset.temporalCoverageFrom || asset.temporalCoverageToInclusive) {
       fields.push({
         icon: 'today',
-        label: 'Temporal Coverage',
+        label: this.translateService.instant('general.coverage'),
         ...this.propertyGridUtils.guessValue(
           this.buildTemporalCoverageString(
             asset.temporalCoverageFrom,
@@ -266,7 +288,7 @@ export class AssetPropertyGridGroupBuilder {
     const properties: PropertyGridField[] = [
       {
         icon: 'category',
-        label: 'Signed',
+        label: this.translateService.instant('general.signed'),
         ...this.propertyGridUtils.guessValue(
           this.propertyGridUtils.formatDate(
             contractAgreement.contractSigningDate,
@@ -275,24 +297,32 @@ export class AssetPropertyGridGroupBuilder {
       },
       {
         icon: 'policy',
-        label: 'Direction',
-        ...this.propertyGridUtils.guessValue(contractAgreement.direction),
+        label: this.translateService.instant('general.direction'),
+        ...this.propertyGridUtils.guessValue(
+          contractAgreement.direction === 'CONSUMING'
+            ? this.translateService.instant('general.consuming')
+            : this.translateService.instant('general.providing'),
+        ),
       },
       {
         icon: 'category',
-        label: 'Contract Agreement ID',
+        label: this.translateService.instant('general.contract') + ' ID',
         ...this.propertyGridUtils.guessValue(
           contractAgreement.contractAgreementId,
         ),
       },
       {
         icon: 'link',
-        label: `Counter-Party ${this.participantIdLocalization.participantId}`,
+        label: `${this.translateService.instant('general.oth_connector')} ${
+          this.participantIdLocalization.participantId
+        }`,
         ...this.propertyGridUtils.guessValue(contractAgreement.counterPartyId),
       },
       {
         icon: 'link',
-        label: 'Counter-Party Connector Endpoint',
+        label: this.translateService.instant(
+          'transfer_history_page.counter_endpoint',
+        ),
         ...this.propertyGridUtils.guessValue(
           contractAgreement.counterPartyAddress,
         ),
@@ -311,7 +341,7 @@ export class AssetPropertyGridGroupBuilder {
     }
 
     return {
-      groupLabel: 'Contract Agreement',
+      groupLabel: this.translateService.instant('general.contract'),
       properties,
     };
   }
@@ -321,10 +351,10 @@ export class AssetPropertyGridGroupBuilder {
     subtitle: string,
   ): PropertyGridGroup {
     return {
-      groupLabel: 'Contract Policy',
+      groupLabel: this.translateService.instant('general.policy'),
       properties: this.policyPropertyFieldBuilder.buildPolicyPropertyFields(
         contractPolicy,
-        'Contract Policy JSON-LD',
+        this.translateService.instant('general.policy') + ' JSON-LD',
         subtitle,
       ),
     };
@@ -333,7 +363,7 @@ export class AssetPropertyGridGroupBuilder {
   buildConnectorEndpointField(endpoint: string): PropertyGridField {
     return {
       icon: 'link',
-      label: 'Connector Endpoint',
+      label: this.translateService.instant('general.endpoint'),
       ...this.propertyGridUtils.guessValue(endpoint),
     };
   }
@@ -341,7 +371,7 @@ export class AssetPropertyGridGroupBuilder {
   buildNutsLocationsField(locations: string[]): PropertyGridField {
     return {
       icon: 'location_on',
-      label: 'NUTS Locations',
+      label: this.translateService.instant('general.nuts'),
       text: locations.join(', '),
     };
   }
@@ -352,11 +382,11 @@ export class AssetPropertyGridGroupBuilder {
   ): PropertyGridField {
     return {
       icon: 'attachment',
-      label: 'Data Samples',
-      text: 'Show Data Samples',
+      label: this.translateService.instant('general.data'),
+      text: this.translateService.instant('general.show_data'),
       onclick: () =>
         this.urlListDialogService.showUrlListDialog({
-          title: `Data Samples`,
+          title: this.translateService.instant('general.data'),
           subtitle: title,
           icon: 'attachment',
           urls: dataSampleUrls,
@@ -371,11 +401,11 @@ export class AssetPropertyGridGroupBuilder {
   ): PropertyGridField {
     return {
       icon: 'receipt',
-      label: 'Reference Files',
-      text: 'Show Reference Files',
+      label: this.translateService.instant('general.files'),
+      text: this.translateService.instant('general.show_files'),
       onclick: () =>
         this.urlListDialogService.showUrlListDialog({
-          title: `Reference Files`,
+          title: this.translateService.instant('general.show_files'),
           subtitle: title,
           icon: 'receipt',
           urls: referenceFileUrls,
diff --git a/src/app/component-library/catalog/asset-detail-dialog/markdown-description/markdown-description.component.html b/src/app/component-library/catalog/asset-detail-dialog/markdown-description/markdown-description.component.html
index d98236700..7e2035708 100644
--- a/src/app/component-library/catalog/asset-detail-dialog/markdown-description/markdown-description.component.html
+++ b/src/app/component-library/catalog/asset-detail-dialog/markdown-description/markdown-description.component.html
@@ -1,3 +1,10 @@
+<!--
+  ~ Copyright (c) 2021-2024. sovity GmbH
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
 <div
   class="overflow-hidden relative"
   [style.height.px]="isCollapsed ? collapsedDescriptionHeight : null">
@@ -8,7 +15,7 @@
       htmlSanitizer.sanitize(markdownConverter.toHtml(description ?? ''))
     "></div>
 
-  <i *ngIf="!description">No description.</i>
+  <i *ngIf="!description">('component_library.no_description' | translate)</i>
 
   <div
     *ngIf="isCollapsed"
@@ -35,6 +42,10 @@
     <mat-icon *ngIf="!isCollapsed" class="mat-icon-[17px] mt-[2px]"
       >keyboard_double_arrow_up</mat-icon
     >
-    {{ isCollapsed ? 'Show more' : 'Show less' }}
+    {{
+      isCollapsed
+        ? ('component_library.show_more' | translate)
+        : ('component_library.show_less' | translate)
+    }}
   </div>
 </button>
diff --git a/src/app/component-library/catalog/asset-detail-dialog/policy-property-field-builder.ts b/src/app/component-library/catalog/asset-detail-dialog/policy-property-field-builder.ts
index 87c7f532e..ec7dff5ce 100644
--- a/src/app/component-library/catalog/asset-detail-dialog/policy-property-field-builder.ts
+++ b/src/app/component-library/catalog/asset-detail-dialog/policy-property-field-builder.ts
@@ -1,4 +1,11 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {Injectable} from '@angular/core';
+import {TranslateService} from '@ngx-translate/core';
 import {UiPolicy} from '@sovity.de/edc-client';
 import {JsonDialogService} from '../../json-dialog/json-dialog/json-dialog.service';
 import {PolicyMapper} from '../../policy-editor/model/policy-mapper';
@@ -9,6 +16,7 @@ export class PolicyPropertyFieldBuilder {
   constructor(
     private jsonDialogService: JsonDialogService,
     private policyMapper: PolicyMapper,
+    private translateService: TranslateService,
   ) {}
 
   buildPolicyPropertyFields(
@@ -19,15 +27,15 @@ export class PolicyPropertyFieldBuilder {
     return [
       {
         icon: 'policy',
-        label: 'Policy',
+        label: this.translateService.instant('general.policy'),
         policy: this.policyMapper.buildPolicy(policy.expression!),
         policyErrors: policy.errors || [],
         additionalContainerClasses: 'col-span-2',
       },
       {
         icon: 'policy',
-        label: 'Policy JSON-LD',
-        text: 'Show JSON-LD',
+        label: this.translateService.instant('general.policy') + ' JSON-LD',
+        text: this.translateService.instant('component_library.json_ld'),
         onclick: () =>
           this.jsonDialogService.showJsonDetailDialog({
             title: policyDetailDialogTitle,
diff --git a/src/app/component-library/catalog/catalog.module.ts b/src/app/component-library/catalog/catalog.module.ts
index 5fc82d064..b246f436c 100644
--- a/src/app/component-library/catalog/catalog.module.ts
+++ b/src/app/component-library/catalog/catalog.module.ts
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {MatButtonModule} from '@angular/material/button';
@@ -8,6 +14,7 @@ import {MatIconModule} from '@angular/material/icon';
 import {MatProgressBarModule} from '@angular/material/progress-bar';
 import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
 import {MatTooltipModule} from '@angular/material/tooltip';
+import {TranslateModule} from '@ngx-translate/core';
 import {InitiateNegotiationConfirmTosDialogModule} from '../initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.module';
 import {JsonDialogModule} from '../json-dialog/json-dialog.module';
 import {PipesAndDirectivesModule} from '../pipes-and-directives/pipes-and-directives.module';
@@ -50,6 +57,7 @@ import {TruncatedShortDescription} from './truncated-short-description/truncated
     PropertyGridModule,
     UiElementsModule,
     PipesAndDirectivesModule,
+    TranslateModule,
 
     InitiateNegotiationConfirmTosDialogModule,
   ],
diff --git a/src/app/component-library/catalog/contract-offer-mini-list/contract-offer-mini-list.component.html b/src/app/component-library/catalog/contract-offer-mini-list/contract-offer-mini-list.component.html
index d1658d1a6..86bc7b418 100644
--- a/src/app/component-library/catalog/contract-offer-mini-list/contract-offer-mini-list.component.html
+++ b/src/app/component-library/catalog/contract-offer-mini-list/contract-offer-mini-list.component.html
@@ -1,3 +1,10 @@
+<!--
+  ~ Copyright (c) 2021-2024. sovity GmbH
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
 <ng-container *ngIf="!data.contractOffers.length">
   <div class="flex flex-row flex-wrap property-grid-group-title">
     Contract Offers
@@ -9,7 +16,10 @@
   <div
     class="flex flex-row items-center space-x-[5px] property-grid-group-title">
     <span>
-      Contract Offer {{ data.contractOffers.length >= 2 ? i + 1 : '' }}
+      <span>
+        {{ 'general.offer' | translate }}
+        {{ data.contractOffers.length >= 2 ? i + 1 : '' }}
+      </span>
     </span>
 
     <mat-progress-spinner
@@ -38,20 +48,22 @@
       "
       [ngSwitch]="contractNegotiationService.negotiationState(contractOffer)"
       (click)="negotiateClick.emit(contractOffer)">
-      <ng-container *ngSwitchCase="'ready'">Negotiate</ng-container>
+      <ng-container *ngSwitchCase="'ready'">{{
+        'component_library.negotiate' | translate
+      }}</ng-container>
       <ng-container *ngSwitchCase="'negotiating'">
-        Negotiating...
+        {{ 'component_library.negotiating' | translate }}
       </ng-container>
       <ng-container *ngSwitchCase="'negotiated'">
-        Successfully Negotiated
+        {{ 'component_library.succ_negotiating' | translate }}
       </ng-container>
     </button>
     <button
       *ngIf="data.asset.isOwnConnector"
       disabled
       mat-raised-button
-      matTooltip="Cannot negotiate contracts with your own connector.">
-      Negotiate
+      matTooltip="{{ 'tooltip.negotiate' | translate }}">
+      {{ 'component_library.negotiate' | translate }}
     </button>
   </div>
 </ng-container>
diff --git a/src/app/component-library/catalog/transfer-history-mini-list/transfer-history-mini-list.component.html b/src/app/component-library/catalog/transfer-history-mini-list/transfer-history-mini-list.component.html
index 9b0c57655..cca53c2a8 100644
--- a/src/app/component-library/catalog/transfer-history-mini-list/transfer-history-mini-list.component.html
+++ b/src/app/component-library/catalog/transfer-history-mini-list/transfer-history-mini-list.component.html
@@ -1,5 +1,12 @@
+<!--
+  ~ Copyright (c) 2021-2024. sovity GmbH
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
 <i *ngIf="!contractAgreement?.transferProcesses?.length">
-  No transfer processes started yet.
+  {{ 'component_library.no_transfer' | translate }}
 </i>
 <div
   *ngFor="let transfer of contractAgreement!.transferProcesses"
diff --git a/src/app/component-library/catalog/truncated-short-description/truncated-short-description.component.html b/src/app/component-library/catalog/truncated-short-description/truncated-short-description.component.html
index d3fba5099..dc231a44e 100644
--- a/src/app/component-library/catalog/truncated-short-description/truncated-short-description.component.html
+++ b/src/app/component-library/catalog/truncated-short-description/truncated-short-description.component.html
@@ -1 +1,9 @@
-{{ text || 'No description.' }}
+{{ text || ('component_library.no_description' | translate) }}
+<!--
+  ~ Copyright (c) 2021-2024. sovity GmbH
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
+<!--{{ text || 'No description.' }}-->
diff --git a/src/app/component-library/confirmation-dialog/confirmation-dialog.module.ts b/src/app/component-library/confirmation-dialog/confirmation-dialog.module.ts
index 703ff1a52..9ab95bded 100644
--- a/src/app/component-library/confirmation-dialog/confirmation-dialog.module.ts
+++ b/src/app/component-library/confirmation-dialog/confirmation-dialog.module.ts
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {ClipboardModule} from '@angular/cdk/clipboard';
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
@@ -6,6 +12,7 @@ import {MatCheckboxModule} from '@angular/material/checkbox';
 import {MatDialogModule} from '@angular/material/dialog';
 import {MatIconModule} from '@angular/material/icon';
 import {MatTooltipModule} from '@angular/material/tooltip';
+import {TranslateModule} from '@ngx-translate/core';
 import {PipesAndDirectivesModule} from '../pipes-and-directives/pipes-and-directives.module';
 import {ConfirmationDialogComponent} from './confirmation-dialog/confirmation-dialog.component';
 
@@ -13,7 +20,7 @@ import {ConfirmationDialogComponent} from './confirmation-dialog/confirmation-di
   imports: [
     // Angular
     CommonModule,
-
+    TranslateModule,
     // Angular CDK
     ClipboardModule,
 
diff --git a/src/app/component-library/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.ts b/src/app/component-library/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.ts
index 27a22a4de..bc9d573b3 100644
--- a/src/app/component-library/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.ts
+++ b/src/app/component-library/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.ts
@@ -1,5 +1,12 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {Component, Inject, OnInit} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
+import {TranslateService} from '@ngx-translate/core';
 
 @Component({
   selector: 'app-confirmation-dialog',
@@ -66,14 +73,19 @@ export class ConfirmDialogModel {
   public static forDelete(
     type: string,
     identifier: string,
+    translateService: TranslateService,
   ): ConfirmDialogModel {
     const dialogData = new ConfirmDialogModel(
-      'Deletion confirmation',
-      `Please confirm you want to delete ${type} ${identifier}. This action cannot be undone.`,
+      `${translateService.instant('component_library.delete_title')}`,
+      `${translateService.instant(
+        'component_library.delete_one',
+      )} ${type} ${identifier} ${translateService.instant(
+        'component_library.delete_two',
+      )}`,
     );
-    dialogData.confirmColor = 'warn';
-    dialogData.confirmText = 'Delete';
-    dialogData.cancelText = 'Cancel';
+    dialogData.confirmColor = translateService.instant('general.warn');
+    dialogData.confirmText = translateService.instant('general.delete');
+    dialogData.cancelText = translateService.instant('general.close');
     return dialogData;
   }
 }
diff --git a/src/app/component-library/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.module.ts b/src/app/component-library/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.module.ts
index e1bdce3f8..7134bafc8 100644
--- a/src/app/component-library/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.module.ts
+++ b/src/app/component-library/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.module.ts
@@ -6,6 +6,7 @@ import {MatCheckboxModule} from '@angular/material/checkbox';
 import {MatDialogModule} from '@angular/material/dialog';
 import {MatIconModule} from '@angular/material/icon';
 import {MatTooltipModule} from '@angular/material/tooltip';
+import {TranslateModule} from '@ngx-translate/core';
 import {PipesAndDirectivesModule} from '../pipes-and-directives/pipes-and-directives.module';
 import {InitiateNegotiationConfirmTosDialogComponent} from './initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component';
 
@@ -13,7 +14,7 @@ import {InitiateNegotiationConfirmTosDialogComponent} from './initiate-negotiati
   imports: [
     // Angular
     CommonModule,
-
+    TranslateModule,
     // Angular CDK
     ClipboardModule,
 
diff --git a/src/app/component-library/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component.html b/src/app/component-library/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component.html
index 07a32ec8e..9e97890d6 100644
--- a/src/app/component-library/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component.html
+++ b/src/app/component-library/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component.html
@@ -1,26 +1,26 @@
-<h1 mat-dialog-title>Data Offer Terms & Conditions</h1>
+<h1 mat-dialog-title>{{ 'component_library.data_offer' | translate }}</h1>
 
 <div mat-dialog-content>
   <p>
-    Hereby I agree that by pressing the 'Confirm' button, I accept the license
-    terms, policies, and additional conditions for use, including any copyright
-    notices, associated with the provider's offer.
+    {{ 'component_library.accept_licence' | translate }}
   </p>
 </div>
 
 <div class="w-full flex flex-col justify-center">
   <mat-checkbox [checked]="checkboxChecked" (change)="onCheckboxChange($event)">
-    I agree to the Data Offer Terms & Conditions
+    {{ 'component_library.agree' | translate }}
   </mat-checkbox>
 
   <div class="w-full flex flex-row justify-end" mat-dialog-actions>
-    <button mat-button color="accent" (click)="onCancel()">Cancel</button>
+    <button mat-button color="accent" (click)="onCancel()">
+      {{ 'general.cancel' | translate }}
+    </button>
     <button
       mat-raised-button
       color="primary"
       [disabled]="!checkboxChecked"
       (click)="onConfirm()">
-      Confirm
+      {{ 'general.confirm' | translate }}
     </button>
   </div>
 </div>
diff --git a/src/app/component-library/json-dialog/json-dialog.module.ts b/src/app/component-library/json-dialog/json-dialog.module.ts
index d0d7e19f5..add14049a 100644
--- a/src/app/component-library/json-dialog/json-dialog.module.ts
+++ b/src/app/component-library/json-dialog/json-dialog.module.ts
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {FormsModule} from '@angular/forms';
@@ -7,6 +13,7 @@ import {MatCheckboxModule} from '@angular/material/checkbox';
 import {MatDialogModule} from '@angular/material/dialog';
 import {MatIconModule} from '@angular/material/icon';
 import {MatTooltipModule} from '@angular/material/tooltip';
+import {TranslateModule} from '@ngx-translate/core';
 import {NgxJsonViewerModule} from 'ngx-json-viewer';
 import {ConfirmationDialogModule} from '../confirmation-dialog/confirmation-dialog.module';
 import {PipesAndDirectivesModule} from '../pipes-and-directives/pipes-and-directives.module';
@@ -18,7 +25,7 @@ import {JsonDialogService} from './json-dialog/json-dialog.service';
     // Angular
     CommonModule,
     FormsModule,
-
+    TranslateModule,
     // Angular Material
     MatButtonModule,
     MatCardModule,
diff --git a/src/app/component-library/json-dialog/json-dialog/json-dialog.component.html b/src/app/component-library/json-dialog/json-dialog/json-dialog.component.html
index b7cefb4e6..c9022e88e 100644
--- a/src/app/component-library/json-dialog/json-dialog/json-dialog.component.html
+++ b/src/app/component-library/json-dialog/json-dialog/json-dialog.component.html
@@ -1,3 +1,10 @@
+<!--
+  ~ Copyright (c) 2021-2024. sovity GmbH
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
 <div class="flex flex-row justify-between space-x-[10px]">
   <div class="mat-card-header" mat-dialog-title removeClass="mat-dialog-title">
     <mat-icon class="mat-card-avatar-icon">
@@ -42,8 +49,8 @@
     <mat-checkbox
       class="example-margin"
       [(ngModel)]="removeNulls"
-      (ngModelChange)="updateVisibleJson()"
-      >Cleaned JSON
+      (ngModelChange)="updateVisibleJson()">
+      {{ 'component_library.json' | translate }}
     </mat-checkbox>
   </div>
   <div class="flex flex-row">
@@ -52,7 +59,7 @@
       color="default"
       [mat-dialog-close]="null"
       [disabled]="busy">
-      Close
+      {{ 'general.close' | translate }}
     </button>
   </div>
 </div>
diff --git a/src/app/component-library/ui-elements/ago/ago.pipe.ts b/src/app/component-library/ui-elements/ago/ago.pipe.ts
index 947f447b4..2b21b223f 100644
--- a/src/app/component-library/ui-elements/ago/ago.pipe.ts
+++ b/src/app/component-library/ui-elements/ago/ago.pipe.ts
@@ -1,6 +1,13 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {Pipe, PipeTransform} from '@angular/core';
 import {Observable, concat, interval, of} from 'rxjs';
 import {distinctUntilChanged, map} from 'rxjs/operators';
+import {TranslateService} from '@ngx-translate/core';
 import {formatDateAgo} from './formatDateAgo';
 
 /**
@@ -10,9 +17,11 @@ import {formatDateAgo} from './formatDateAgo';
 export class AgoPipe implements PipeTransform {
   interval$ = concat(of({}), interval(3000));
 
+  constructor(private translateService: TranslateService) {}
+
   transform(date?: Date | null): Observable<string> {
     return this.interval$.pipe(
-      map(() => formatDateAgo(date)),
+      map(() => formatDateAgo(date, this.translateService.currentLang)),
       distinctUntilChanged(),
     );
   }
diff --git a/src/app/component-library/ui-elements/ago/formatDateAgo.ts b/src/app/component-library/ui-elements/ago/formatDateAgo.ts
index 99209c52c..f46a54321 100644
--- a/src/app/component-library/ui-elements/ago/formatDateAgo.ts
+++ b/src/app/component-library/ui-elements/ago/formatDateAgo.ts
@@ -1,16 +1,27 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {formatDistanceToNow} from 'date-fns';
+import {de, enUS} from 'date-fns/locale';
 import {DateInput} from './date-input';
 
 /**
  * Formats date as "{n} {timeUnit} ago" or "in {n} {timeUnit}s".
  * @param date date
  */
-export function formatDateAgo(date?: DateInput | null): string {
+export function formatDateAgo(
+  date?: DateInput | null,
+  locale?: string,
+): string {
   if (!date) {
     return 'never';
   }
   if (typeof date === 'string') {
     date = new Date(date);
   }
-  return formatDistanceToNow(date, {addSuffix: true});
+  const localeDateNfs = locale === 'de' ? de : enUS;
+  return formatDistanceToNow(date, {addSuffix: true, locale: localeDateNfs});
 }
diff --git a/src/app/component-library/url-list-dialog/url-list-dialog.module.ts b/src/app/component-library/url-list-dialog/url-list-dialog.module.ts
index 00f1deb44..957d56f13 100644
--- a/src/app/component-library/url-list-dialog/url-list-dialog.module.ts
+++ b/src/app/component-library/url-list-dialog/url-list-dialog.module.ts
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {FormsModule} from '@angular/forms';
@@ -5,6 +11,7 @@ import {MatButtonModule} from '@angular/material/button';
 import {MatCardModule} from '@angular/material/card';
 import {MatDialogModule} from '@angular/material/dialog';
 import {MatIconModule} from '@angular/material/icon';
+import {TranslateModule} from '@ngx-translate/core';
 import {NgxJsonViewerModule} from 'ngx-json-viewer';
 import {ConfirmationDialogModule} from '../confirmation-dialog/confirmation-dialog.module';
 import {PipesAndDirectivesModule} from '../pipes-and-directives/pipes-and-directives.module';
@@ -16,7 +23,7 @@ import {UrlListDialogService} from './url-list-dialog/url-list-dialog.service';
     // Angular
     CommonModule,
     FormsModule,
-
+    TranslateModule,
     // Angular Material
     MatButtonModule,
     MatCardModule,
diff --git a/src/app/component-library/url-list-dialog/url-list-dialog/url-list-dialog.component.html b/src/app/component-library/url-list-dialog/url-list-dialog/url-list-dialog.component.html
index 17c076013..4bb741b72 100644
--- a/src/app/component-library/url-list-dialog/url-list-dialog/url-list-dialog.component.html
+++ b/src/app/component-library/url-list-dialog/url-list-dialog/url-list-dialog.component.html
@@ -1,3 +1,10 @@
+<!--
+  ~ Copyright (c) 2021-2024. sovity GmbH
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
 <div class="flex flex-row justify-between space-x-[10px]">
   <div class="mat-card-header" mat-dialog-title removeClass="mat-dialog-title">
     <mat-icon class="mat-card-avatar-icon">
@@ -18,7 +25,7 @@
   mat-dialog-content
   style="display: block; min-width: 40rem; max-width: 40rem; max-height: 60vh">
   <div *ngIf="data.description">
-    <div class="text-[15px] font-medium">Description</div>
+    <div class="text-[15px] font-medium">{{ 'general.description' | translate }}</div>
     <div>{{ data.description }}</div>
   </div>
 
@@ -34,5 +41,7 @@
 </div>
 
 <div class="w-full justify-end flex flex-row" mat-dialog-actions>
-  <button mat-button color="default" [mat-dialog-close]="null">Close</button>
+  <button mat-button color="default" [mat-dialog-close]="null">
+    {{ 'general.close' | translate }}
+  </button>
 </div>
diff --git a/src/app/core/services/connector-info-property-grid-group-builder.ts b/src/app/core/services/connector-info-property-grid-group-builder.ts
index 462cebcdb..cefbba33d 100644
--- a/src/app/core/services/connector-info-property-grid-group-builder.ts
+++ b/src/app/core/services/connector-info-property-grid-group-builder.ts
@@ -1,5 +1,12 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {Injectable} from '@angular/core';
 import {MatDialog} from '@angular/material/dialog';
+import {TranslateService} from '@ngx-translate/core';
 import {DashboardPage} from '@sovity.de/edc-client';
 import {JsonDialogComponent} from '../../component-library/json-dialog/json-dialog/json-dialog.component';
 import {JsonDialogData} from '../../component-library/json-dialog/json-dialog/json-dialog.data';
@@ -16,12 +23,13 @@ export class ConnectorInfoPropertyGridGroupBuilder {
     private participantIdLocalization: ParticipantIdLocalization,
     private propertyGridUtils: PropertyGridFieldService,
     private matDialog: MatDialog,
+    private translateService: TranslateService,
   ) {}
 
   private onShowConnectorVersionClick(title: string, versionData: any) {
     const data: JsonDialogData = {
       title,
-      subtitle: 'Show Details',
+      subtitle: this.translateService.instant('general.details'),
       icon: 'link',
       objectForJson: versionData,
     };
@@ -86,13 +94,14 @@ export class ConnectorInfoPropertyGridGroupBuilder {
           label: 'UI Version',
           text: data.trim().toString()
             ? this.asDate(data.trim().toString())
-            : 'Show Details',
+            : this.translateService.instant('general.details'),
           onclick: () =>
             this.onShowConnectorVersionClick('Version Information', {
               'UI Last Commit Information': uiCommitDetails.match({
                 ifOk: (uiCommitdata) => uiCommitdata,
                 ifError: (error) => error.failureMessage,
-                ifLoading: () => 'Still Loading...',
+                ifLoading: () =>
+                  this.translateService.instant('general.loading2'),
               }),
             }),
         },
@@ -101,7 +110,7 @@ export class ConnectorInfoPropertyGridGroupBuilder {
         {
           icon: 'link',
           label: 'UI Version',
-          text: 'Show Details',
+          text: this.translateService.instant('general.details'),
           onclick: () =>
             this.onShowConnectorVersionClick('Version Information', {
               'UI Commit Information': error.failureMessage,
@@ -112,7 +121,7 @@ export class ConnectorInfoPropertyGridGroupBuilder {
         {
           icon: 'link',
           label: 'UI Version',
-          text: 'Loading...',
+          text: this.translateService.instant('general.loading'),
         },
       ],
     });
@@ -125,12 +134,16 @@ export class ConnectorInfoPropertyGridGroupBuilder {
     const fields: PropertyGridField[] = dashboardData.match<
       PropertyGridField[]
     >({
-      ifLoading: () => [{icon: 'info', label: 'Loading', text: 'Loading...'}],
+      ifLoading: () => [{
+        icon: 'info',
+        label: this.translateService.instant('general.loading1'),
+        text: this.translateService.instant('general.loading')
+      }],
       ifError: () => [
         {
           icon: 'error',
-          label: 'Error',
-          text: 'Failed loading connector information',
+          label: this.translateService.instant('general.error'),
+          text: this.translateService.instant('services.failed_loading'),
         },
       ],
       ifOk: (data) => this.buildConnectorMetadata(data),
@@ -146,7 +159,7 @@ export class ConnectorInfoPropertyGridGroupBuilder {
     const fields = [
       {
         icon: 'link',
-        label: 'Connector Endpoint',
+        label: this.translateService.instant('general.endpoint'),
         ...this.propertyGridUtils.guessValue(data.connectorEndpoint),
       },
       {
@@ -156,32 +169,32 @@ export class ConnectorInfoPropertyGridGroupBuilder {
       },
       {
         icon: 'title',
-        label: 'Title',
+        label: this.translateService.instant('general.title'),
         ...this.propertyGridUtils.guessValue(data.connectorTitle),
       },
       {
         icon: 'apartment',
-        label: 'Curator Organization Name',
+        label: this.translateService.instant('services.curator_org'),
         ...this.propertyGridUtils.guessValue(data.connectorCuratorName),
       },
       {
         icon: 'apartment',
-        label: 'Curator URL',
+        label: this.translateService.instant('services.curator_url'),
         ...this.propertyGridUtils.guessValue(data.connectorCuratorUrl),
       },
       {
         icon: 'title',
-        label: 'Description',
+        label: this.translateService.instant('general.description'),
         ...this.propertyGridUtils.guessValue(data.connectorDescription),
       },
       {
         icon: 'contact_support',
-        label: 'Maintainer Organization Name',
+        label: this.translateService.instant('services.maintainer'),
         ...this.propertyGridUtils.guessValue(data.connectorMaintainerName),
       },
       {
         icon: 'contact_support',
-        label: 'Maintainer URL',
+        label: this.translateService.instant('services.main_url'),
         ...this.propertyGridUtils.guessValue(data.connectorMaintainerUrl),
       },
     ];
diff --git a/src/app/core/services/contract-negotiation.service.ts b/src/app/core/services/contract-negotiation.service.ts
index adf9da50b..b1d6cdbee 100644
--- a/src/app/core/services/contract-negotiation.service.ts
+++ b/src/app/core/services/contract-negotiation.service.ts
@@ -1,7 +1,14 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {Injectable} from '@angular/core';
 import {MatDialog} from '@angular/material/dialog';
 import {EMPTY, Observable, interval} from 'rxjs';
 import {catchError, filter, first, switchMap, tap} from 'rxjs/operators';
+import {TranslateService} from '@ngx-translate/core';
 import {
   ContractNegotiationRequest,
   UiContractNegotiation,
@@ -22,6 +29,7 @@ export class ContractNegotiationService {
     private edcApiService: EdcApiService,
     private notificationService: NotificationService,
     private confirmationDialog: MatDialog,
+    private translateService: TranslateService,
   ) {
     if (!environment.production) {
       // Test data on local dev
@@ -106,7 +114,8 @@ export class ContractNegotiationService {
   }
 
   private onFailureStarting() {
-    this.notificationService.showError('Failure starting negotiation.');
+    const err = this.translateService.instant('notification.starting_neg');
+    this.notificationService.showError(err);
   }
 
   private onStarted(contractOfferId: string) {
@@ -115,13 +124,15 @@ export class ContractNegotiationService {
 
   private onFailureNegotiating(contractOfferId: string) {
     this.runningContractOffers.delete(contractOfferId);
-    this.notificationService.showError('Failed negotiating contract.');
+    const err2 = this.translateService.instant('notification.negotiation');
+    this.notificationService.showError(err2);
   }
 
   private onSuccess(contractOfferId: string) {
     this.runningContractOffers.delete(contractOfferId);
     this.doneContractOffers.add(contractOfferId);
-    this.notificationService.showInfo('Contract Negotiation complete!');
+    const mes = this.translateService.instant('notification.compl_negotiation');
+    this.notificationService.showError(mes);
   }
 
   private initiateNegotiation(
diff --git a/src/app/core/services/page-title-strategy.ts b/src/app/core/services/page-title-strategy.ts
new file mode 100644
index 000000000..7c84fe413
--- /dev/null
+++ b/src/app/core/services/page-title-strategy.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
+import {Injectable} from '@angular/core';
+import {Title} from '@angular/platform-browser';
+import {RouterStateSnapshot, TitleStrategy} from '@angular/router';
+import {TranslateService} from '@ngx-translate/core';
+
+@Injectable()
+export class CustomPageTitleStrategy extends TitleStrategy {
+  constructor(
+    private translateService: TranslateService,
+    private readonly title: Title,
+  ) {
+    super();
+  }
+
+  override updateTitle(snapshot: RouterStateSnapshot): void {
+    const title = this.buildTitle(snapshot);
+    if (title) {
+      this.translateService.get(title).subscribe((translatedTitle) => {
+        this.title.setTitle(translatedTitle);
+      });
+    } else {
+      this.title.setTitle('DEFAULT_TITLE');
+    }
+  }
+}
diff --git a/src/app/core/services/participant-id-localization.ts b/src/app/core/services/participant-id-localization.ts
index 2c225295c..0914ce4b0 100644
--- a/src/app/core/services/participant-id-localization.ts
+++ b/src/app/core/services/participant-id-localization.ts
@@ -1,14 +1,35 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {Inject, Injectable} from '@angular/core';
+import {TranslateService} from '@ngx-translate/core';
 import {APP_CONFIG, AppConfig} from '../config/app-config';
 
 @Injectable({providedIn: 'root'})
 export class ParticipantIdLocalization {
+  constructor(
+    @Inject(APP_CONFIG) private config: AppConfig,
+    private translateService: TranslateService,
+  ) {
+    this.translateService
+      .stream([
+        'component_library.connector_id',
+        'component_library.participant_id',
+      ])
+      .subscribe((translations) => {
+        this.participantId = this.mds
+          ? translations['component_library.connector_id']
+          : translations['component_library.participant_id'];
+        this.participantIdPlural = this.participantId + 's';
+      });
+  }
   private mds = this.config.features.has('mds-connector-id');
-  participantId = this.mds ? 'Connector ID' : 'Participant ID';
+  participantId = ''; // init, will be updated by translateService
   participantIdPlural = this.participantId + 's';
   participantIdPlaceholder = this.mds
     ? 'MDSL1234XX.C1234XX'
     : 'other-connector-participant-id';
-
-  constructor(@Inject(APP_CONFIG) private config: AppConfig) {}
 }
diff --git a/src/app/routes/connector-ui/asset-page/asset-page.module.ts b/src/app/routes/connector-ui/asset-page/asset-page.module.ts
index 33d61a3a7..9ed22af19 100644
--- a/src/app/routes/connector-ui/asset-page/asset-page.module.ts
+++ b/src/app/routes/connector-ui/asset-page/asset-page.module.ts
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
@@ -20,6 +26,7 @@ import {MatSlideToggleModule} from '@angular/material/slide-toggle';
 import {MatStepperModule} from '@angular/material/stepper';
 import {MatTooltipModule} from '@angular/material/tooltip';
 import {RouterModule} from '@angular/router';
+import {TranslateModule} from '@ngx-translate/core';
 import {CatalogModule} from '../../../component-library/catalog/catalog.module';
 import {DataAddressModule} from '../../../component-library/data-address/data-address.module';
 import {PipesAndDirectivesModule} from '../../../component-library/pipes-and-directives/pipes-and-directives.module';
@@ -43,7 +50,7 @@ import {TransportModeSelectComponent} from './transport-mode-select/transport-mo
     FormsModule,
     ReactiveFormsModule,
     RouterModule,
-
+    TranslateModule,
     // Angular Material
     MatBadgeModule,
     MatButtonModule,
diff --git a/src/app/routes/connector-ui/asset-page/asset-page/asset-page.component.html b/src/app/routes/connector-ui/asset-page/asset-page/asset-page.component.html
index e2b90224b..9dfe3037b 100644
--- a/src/app/routes/connector-ui/asset-page/asset-page/asset-page.component.html
+++ b/src/app/routes/connector-ui/asset-page/asset-page/asset-page.component.html
@@ -1,3 +1,10 @@
+<!--
+  ~ Copyright (c) 2021-2024. sovity GmbH
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
 <div id="wrapper">
   <div class="flex flex-row !space-x-[10px] items-start">
     <!-- Search Bar -->
@@ -5,7 +12,7 @@
       class="search-form-field"
       appearance="outline"
       color="primary">
-      <mat-label>Search assets</mat-label>
+      <mat-label>{{ 'asset_page.search_assets' | translate }}</mat-label>
       <input matInput [(ngModel)]="searchText" (input)="onSearch()" />
       <mat-icon matPrefix>search</mat-icon>
       <button
@@ -26,7 +33,7 @@
       (click)="onCreate()">
       <div class="flex justify-center items-center h-full gap-1">
         <mat-icon class="mt-[1px]">add_circle_outline</mat-icon>
-        Create asset
+        {{ 'asset_page.create_assets' | translate }}
       </div>
     </button>
 
@@ -58,7 +65,7 @@
           !assetList.data.filteredAssets.length)
       "
       class="min-h-[35rem]"
-      [emptyMessage]="'No assets found with given filter.'"></empty-state>
+      [emptyMessage]="'asset_page.no_assets' | translate"></empty-state>
   </div>
 
   <div class="flex flex-row flex-wrap">
diff --git a/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-fetch-detail-dialog/catalog-browser-fetch-detail-dialog.component.html b/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-fetch-detail-dialog/catalog-browser-fetch-detail-dialog.component.html
index d4298a605..b26962fcb 100644
--- a/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-fetch-detail-dialog/catalog-browser-fetch-detail-dialog.component.html
+++ b/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-fetch-detail-dialog/catalog-browser-fetch-detail-dialog.component.html
@@ -1,8 +1,19 @@
+<!--
+  ~ Copyright (c) 2021-2024. sovity GmbH
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
 <div class="mat-card-header" mat-dialog-title removeClass="mat-dialog-title">
-  <mat-icon class="mat-card-avatar-icon"> view_timeline </mat-icon>
+  <mat-icon class="mat-card-avatar-icon">view_timeline </mat-icon>
   <div class="mat-card-header-text">
-    <div class="mat-card-title">Fetch Status</div>
-    <div class="mat-card-subtitle">Other Connector Endpoint Catalogs</div>
+    <div class="mat-card-title">
+      {{ 'catalog_browser_page.fetch' | translate }}
+    </div>
+    <div class="mat-card-subtitle">
+      {{ 'catalog_browser_page.endpoint_catalogs' | translate }}
+    </div>
   </div>
 </div>
 
@@ -23,8 +34,10 @@
 </div>
 
 <div class="w-full flex flex-row justify-end" mat-dialog-actions>
-  <button mat-button color="default" [mat-dialog-close]="null">Cancel</button>
+  <button mat-button color="default" [mat-dialog-close]="null">
+    {{ 'general.cancel' | translate }}
+  </button>
   <button mat-flat-button color="primary" (click)="dialogData.refresh()">
-    Refresh
+    {{ 'general.refresh' | translate }}
   </button>
 </div>
diff --git a/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page.module.ts b/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page.module.ts
index 3b83ae9cb..e1d625c34 100644
--- a/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page.module.ts
+++ b/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page.module.ts
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {ClipboardModule} from '@angular/cdk/clipboard';
 import {CommonModule} from '@angular/common';
 import {HttpClientModule} from '@angular/common/http';
@@ -27,6 +33,7 @@ import {MatTableModule} from '@angular/material/table';
 import {MatTabsModule} from '@angular/material/tabs';
 import {MatTooltipModule} from '@angular/material/tooltip';
 import {RouterModule} from '@angular/router';
+import {TranslateModule} from '@ngx-translate/core';
 import {CatalogModule} from '../../../component-library/catalog/catalog.module';
 import {JsonDialogModule} from '../../../component-library/json-dialog/json-dialog.module';
 import {PipesAndDirectivesModule} from '../../../component-library/pipes-and-directives/pipes-and-directives.module';
@@ -45,7 +52,7 @@ import {DataOfferBuilder} from './catalog-browser-page/data-offer-builder';
     FormsModule,
     ReactiveFormsModule,
     RouterModule,
-
+    TranslateModule,
     // Angular CDK
     ClipboardModule,
 
diff --git a/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/catalog-browser-page.component.html b/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/catalog-browser-page.component.html
index f6c805bb4..52c15f2ca 100644
--- a/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/catalog-browser-page.component.html
+++ b/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/catalog-browser-page.component.html
@@ -1,8 +1,15 @@
+<!--
+  ~ Copyright (c) 2021-2024. sovity GmbH
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
 <div id="wrapper">
   <div class="flex flex-row">
     <!-- Search Bar -->
     <mat-form-field class="search-form-field" color="accent">
-      <mat-label>Search catalog</mat-label>
+      <mat-label>{{ 'catalog_browser_page.search' | translate }}</mat-label>
       <mat-icon matPrefix>search</mat-icon>
       <input matInput [formControl]="searchText" />
       <button
@@ -25,7 +32,9 @@
           ? data.requestTotals.numFailed
           : undefined
       ">
-      <mat-label>Connector Endpoints</mat-label>
+      <mat-label>{{
+        'catalog_browser_page.con_endpoints' | translate
+      }}</mat-label>
       <mat-icon matPrefix>link</mat-icon>
       <input
         matInput
@@ -41,7 +50,7 @@
         *ngIf="!data.requestTotals.isDone"
         matSuffix
         mat-icon-button
-        matTooltip="Click for details"
+        matTooltip="{{ 'tooltip.details' | translate }}"
         (click)="onShowFetchDetails()">
         <mat-progress-spinner
           matSuffix
@@ -56,7 +65,7 @@
         matSuffix
         color="warn"
         mat-icon-button
-        matTooltip="Click for failed catalog details"
+        matTooltip="{{ 'tooltip.failed_details' | translate }}"
         (click)="onShowFetchDetails()">
         <mat-icon>warning</mat-icon>
       </button>
@@ -65,7 +74,7 @@
         matSuffix
         color="primary"
         mat-icon-button
-        matTooltip="Click for details"
+        matTooltip="{{ 'tooltip.details' | translate }}"
         (click)="onShowFetchDetails()">
         <mat-icon>info</mat-icon>
       </button>
@@ -87,7 +96,9 @@
     <empty-state
       *ngIf="data.requestTotals.isNothingReady && !data.requests.length"
       class="min-h-[35rem]"
-      emptyMessage="Please enter other connector endpoints to fetch catalogs."></empty-state>
+      [emptyMessage]="
+        'catalog_browser_page.enter_endpoints' | translate
+      "></empty-state>
     <loading-state
       *ngIf="
         data.requestTotals.isNothingReady &&
@@ -102,7 +113,9 @@
     <empty-state
       *ngIf="data.requestTotals.isSomeReady && !data.filteredDataOffers.length"
       class="min-h-[35rem]"
-      emptyMessage="No contract offers found with this filter"></empty-state>
+      [emptyMessage]="
+        'catalog_browser_page.no_contract_offers' | translate
+      "></empty-state>
   </div>
   <div
     *ngIf="data.requestTotals.isSomeReady && !!data.numTotalContractOffers"
diff --git a/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/catalog-browser-page.component.ts b/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/catalog-browser-page.component.ts
index 9cea0a04e..681ebefb7 100644
--- a/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/catalog-browser-page.component.ts
+++ b/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/catalog-browser-page.component.ts
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {Component, OnDestroy, OnInit} from '@angular/core';
 import {FormControl} from '@angular/forms';
 import {MatDialog} from '@angular/material/dialog';
@@ -9,6 +15,7 @@ import {
   sampleTime,
 } from 'rxjs';
 import {filter, map} from 'rxjs/operators';
+import {TranslateService} from '@ngx-translate/core';
 import {AssetDetailDialogDataService} from '../../../../component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.service';
 import {AssetDetailDialogService} from '../../../../component-library/catalog/asset-detail-dialog/asset-detail-dialog.service';
 import {DataOffer} from '../../../../core/services/models/data-offer';
@@ -38,6 +45,7 @@ export class CatalogBrowserPageComponent implements OnInit, OnDestroy {
     private catalogBrowserPageService: CatalogBrowserPageService,
     private catalogApiUrlService: CatalogApiUrlService,
     private matDialog: MatDialog,
+    private translateService: TranslateService,
   ) {}
 
   ngOnInit(): void {
@@ -76,12 +84,13 @@ export class CatalogBrowserPageComponent implements OnInit, OnDestroy {
 
   private buildPresetCatalogUrlsMessage(): string {
     const urls = this.catalogApiUrlService.getPresetProviders();
+    const usage = this.translateService.instant('catalog_browser_page.usage');
     if (!urls.length) {
       return '';
     }
-    return `Already using${
-      urls.length > 1 ? ` (${urls.length})` : ''
-    }: ${urls.join(', ')}`;
+    return `${usage} ${urls.length > 1 ? ` (${urls.length})` : ''}: ${urls.join(
+      ', ',
+    )}`;
   }
 
   private searchText$(): Observable<string> {
diff --git a/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/data-offer-builder.ts b/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/data-offer-builder.ts
index 7ea6e5dc0..6dc2fddcd 100644
--- a/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/data-offer-builder.ts
+++ b/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/data-offer-builder.ts
@@ -1,4 +1,11 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {Injectable} from '@angular/core';
+import {TranslateService} from '@ngx-translate/core';
 import {UiContractOffer, UiDataOffer} from '@sovity.de/edc-client';
 import {PolicyPropertyFieldBuilder} from '../../../../component-library/catalog/asset-detail-dialog/policy-property-field-builder';
 import {AssetBuilder} from '../../../../core/services/asset-builder';
@@ -11,6 +18,7 @@ export class DataOfferBuilder {
   constructor(
     private assetBuilder: AssetBuilder,
     private policyPropertyFieldBuilder: PolicyPropertyFieldBuilder,
+    private translateService: TranslateService,
   ) {}
   buildDataOffer(dataOffer: UiDataOffer): DataOffer {
     const asset = this.assetBuilder.buildAsset(dataOffer.asset);
@@ -51,6 +59,9 @@ export class DataOfferBuilder {
   }
 
   private getGroupLabel(i: number, total: number) {
-    return `Contract Offer ${total > 1 ? i : ''}`;
+    const contract = this.translateService.instant(
+      'catalog_browser_page.contract',
+    );
+    return `${contract}  ${total > 1 ? i : ''}`;
   }
 }
diff --git a/src/app/routes/connector-ui/connector-ui-routing.module.ts b/src/app/routes/connector-ui/connector-ui-routing.module.ts
index a948fa144..4a61aeebb 100644
--- a/src/app/routes/connector-ui/connector-ui-routing.module.ts
+++ b/src/app/routes/connector-ui/connector-ui-routing.module.ts
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {NgModule} from '@angular/core';
 import {RouterModule, Routes} from '@angular/router';
 import {AssetEditPageComponent} from './asset-edit-page/asset-edit-page/asset-edit-page.component';
diff --git a/src/app/routes/connector-ui/connector-ui.component.html b/src/app/routes/connector-ui/connector-ui.component.html
index 6642469c5..94ee7c661 100644
--- a/src/app/routes/connector-ui/connector-ui.component.html
+++ b/src/app/routes/connector-ui/connector-ui.component.html
@@ -1,3 +1,10 @@
+<!--
+  ~ Copyright (c) 2021-2024. sovity GmbH
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
 <mat-sidenav-container class="sidenav-container">
   <mat-sidenav
     class="sidenav"
@@ -33,6 +40,7 @@
         </mat-nav-list>
       </div>
     </div>
+    <app-language-selector style="display: flex;" class="language"></app-language-selector>
     <div
       *ngIf="'sovity-zammad-integration' | isActiveFeature"
       id="contact-form"
@@ -74,7 +82,7 @@
         (click)="drawer.toggle()">
         <mat-icon aria-label="Side nav toggle icon">menu</mat-icon>
       </button>
-      <span>{{ titleService.getTitle() }}</span>
+      <span>{{ titleService.getTitle() || '' | translate }}</span>
     </mat-toolbar>
     <main class="container">
       <router-outlet></router-outlet>
diff --git a/src/app/routes/connector-ui/connector-ui.component.scss b/src/app/routes/connector-ui/connector-ui.component.scss
index 67fc9a63d..13b58fd1f 100644
--- a/src/app/routes/connector-ui/connector-ui.component.scss
+++ b/src/app/routes/connector-ui/connector-ui.component.scss
@@ -1,7 +1,25 @@
+/*!
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
+
 .sidenav-container {
   height: 100%;
 }
 
+.languageSelector {
+  width: 10px;
+  background-color: red;
+}
+
+.language {
+  margin-top: 10px;
+  margin-right: auto;
+  padding: 8px 16px;
+}
+
 .sidenav {
   width: 300px;
 }
diff --git a/src/app/routes/connector-ui/connector-ui.component.ts b/src/app/routes/connector-ui/connector-ui.component.ts
index 021973886..dc1d82e5a 100644
--- a/src/app/routes/connector-ui/connector-ui.component.ts
+++ b/src/app/routes/connector-ui/connector-ui.component.ts
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {BreakpointObserver, Breakpoints} from '@angular/cdk/layout';
 import {Component, Inject, OnInit} from '@angular/core';
 import {Title} from '@angular/platform-browser';
@@ -5,6 +11,7 @@ import {Observable} from 'rxjs';
 import {map, shareReplay} from 'rxjs/operators';
 import {NavItemGroup} from 'src/app/core/services/models/nav-item-group';
 import {NavItemsBuilder} from 'src/app/core/services/nav-items-builder';
+import {TranslateService} from '@ngx-translate/core';
 import {APP_CONFIG, AppConfig} from '../../core/config/app-config';
 import {LoginPollingService} from '../../core/services/login-polling.service';
 import {TitleUtilsService} from '../../core/services/title-utils.service';
@@ -32,8 +39,11 @@ export class ConnectorUiComponent implements OnInit {
     private breakpointObserver: BreakpointObserver,
     private loginPollingService: LoginPollingService,
     private navItemsBuilder: NavItemsBuilder,
+    private translateService: TranslateService,
   ) {
     this.navItemGroups = this.navItemsBuilder.buildNavItemGroups();
+    this.translateService.setDefaultLang('en');
+    this.translateService.use(localStorage.getItem('selectedLanguage') || 'en');
   }
 
   ngOnInit() {
diff --git a/src/app/routes/connector-ui/connector-ui.module.ts b/src/app/routes/connector-ui/connector-ui.module.ts
index 6d7211378..4866cc33a 100644
--- a/src/app/routes/connector-ui/connector-ui.module.ts
+++ b/src/app/routes/connector-ui/connector-ui.module.ts
@@ -1,13 +1,24 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {CommonModule} from '@angular/common';
+import {HttpClient} from '@angular/common/http';
 import {NgModule} from '@angular/core';
 import {MatButtonModule} from '@angular/material/button';
 import {MatNativeDateModule} from '@angular/material/core';
 import {MatDatepickerModule} from '@angular/material/datepicker';
+import {MatFormFieldModule} from '@angular/material/form-field';
 import {MatIconModule} from '@angular/material/icon';
 import {MatListModule} from '@angular/material/list';
+import {MatMenuModule} from '@angular/material/menu';
+import {MatSelectModule} from '@angular/material/select';
 import {MatSidenavModule} from '@angular/material/sidenav';
 import {MatSnackBarModule} from '@angular/material/snack-bar';
 import {MatToolbarModule} from '@angular/material/toolbar';
+import {TranslateModule} from '@ngx-translate/core';
 import {PipesAndDirectivesModule} from '../../component-library/pipes-and-directives/pipes-and-directives.module';
 import {UiElementsModule} from '../../component-library/ui-elements/ui-elements.module';
 import {AssetEditPageModule} from './asset-edit-page/asset-edit-page.module';
@@ -18,6 +29,7 @@ import {ConnectorUiComponent} from './connector-ui.component';
 import {ContractAgreementPageModule} from './contract-agreement-page/contract-agreement-page.module';
 import {ContractDefinitionPageModule} from './contract-definition-page/contract-definition-page.module';
 import {DashboardPageModule} from './dashboard-page/dashboard-page.module';
+import {LanguageSelectorComponent} from './language-selector/language-selector.component';
 import {LocationHistoryUtils} from './logout-page/location-history-utils';
 import {LogoutPageModule} from './logout-page/logout-page.module';
 import {PreviousRouteListener} from './logout-page/previous-route-listener';
@@ -39,10 +51,14 @@ import {TransferHistoryPageModule} from './transfer-history-page/transfer-histor
     MatSidenavModule,
     MatSnackBarModule,
     MatToolbarModule,
+    MatMenuModule,
+    MatFormFieldModule,
+    MatSelectModule,
 
     // Features
     PipesAndDirectivesModule,
     UiElementsModule,
+    TranslateModule,
 
     // Pages
     AssetPageModule,
@@ -59,8 +75,8 @@ import {TransferHistoryPageModule} from './transfer-history-page/transfer-histor
     // Routing
     ConnectorUiRoutingModule,
   ],
-  declarations: [ConnectorUiComponent],
-  providers: [PreviousRouteListener, LocationHistoryUtils],
+  declarations: [ConnectorUiComponent, LanguageSelectorComponent],
+  providers: [PreviousRouteListener, LocationHistoryUtils, HttpClient],
 })
 export class ConnectorUiModule {
   constructor(previousRouteListener: PreviousRouteListener) {
diff --git a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-cards.component.html b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-cards.component.html
index 8586452a1..ebf6d20ad 100644
--- a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-cards.component.html
+++ b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-cards.component.html
@@ -1,3 +1,10 @@
+<!--
+  ~ Copyright (c) 2021-2024. sovity GmbH
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
 <div class="flex flex-row flex-wrap gap-[16px] justify-start">
   <mat-card
     *ngFor="let card of contractAgreements"
@@ -37,7 +44,9 @@
       <div class="flex flex-row space-x-[10px] justify-between">
         <!-- Signed -->
         <div class="flex flex-col flex-grow">
-          <div class="text-slate text-sm uppercase tracking-wider">Signed</div>
+          <div class="text-slate text-sm uppercase tracking-wider">
+            {{ 'general.signed' | translate }}
+          </div>
           <div>
             <ago [date]="card.contractSigningDate"></ago>
           </div>
@@ -56,7 +65,9 @@
       <div class="flex flex-row space-x-[10px] justify-between">
         <!-- Counterparty Address -->
         <div class="flex flex-col">
-          <div class="text-slate text-sm uppercase">Other Connector</div>
+          <div class="text-slate text-sm uppercase">
+            {{ 'general.oth_connector' | translate }}
+          </div>
           <div>
             <a
               class="link break-all"
diff --git a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page.module.ts b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page.module.ts
index 35e6c4176..f5ca6e815 100644
--- a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page.module.ts
+++ b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page.module.ts
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
@@ -20,6 +26,7 @@ import {MatSlideToggleModule} from '@angular/material/slide-toggle';
 import {MatStepperModule} from '@angular/material/stepper';
 import {MatTooltipModule} from '@angular/material/tooltip';
 import {RouterModule} from '@angular/router';
+import {TranslateModule} from '@ngx-translate/core';
 import {NgChartsModule} from 'ng2-charts';
 import {NgxJsonViewerModule} from 'ngx-json-viewer';
 import {CatalogModule} from '../../../component-library/catalog/catalog.module';
@@ -38,7 +45,7 @@ import {ContractAgreementTransferDialogComponent} from './contract-agreement-tra
     FormsModule,
     ReactiveFormsModule,
     RouterModule,
-
+    TranslateModule,
     // Angular Material
     MatBadgeModule,
     MatButtonModule,
diff --git a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page/contract-agreement-page.component.html b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page/contract-agreement-page.component.html
index d84d22141..7dc6d1c42 100644
--- a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page/contract-agreement-page.component.html
+++ b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page/contract-agreement-page.component.html
@@ -1,3 +1,10 @@
+<!--
+  ~ Copyright (c) 2021-2024. sovity GmbH
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
 <div id="wrapper">
   <div class="flex flex-row gap-4">
     <!-- Search -->
@@ -5,7 +12,9 @@
       class="search-form-field"
       appearance="outline"
       color="accent">
-      <mat-label>Search contract agreements...</mat-label>
+      <mat-label>{{
+        'contract_agreement_page.search_agree' | translate
+      }}</mat-label>
       <input matInput [formControl]="searchText" />
       <mat-icon matPrefix>search</mat-icon>
       <button
@@ -59,7 +68,9 @@
     <empty-state
       *ngIf="page.isReady && !page.data.numTotalContractAgreements"
       class="min-h-[35rem]"
-      [emptyMessage]="'No contract agreements yet.'"></empty-state>
+      [emptyMessage]="
+        'contract_agreement_page.no_agree' | translate
+      "></empty-state>
     <empty-state
       *ngIf="
         page.isReady &&
@@ -71,7 +82,7 @@
       "
       class="min-h-[35rem]"
       [emptyMessage]="
-        'No contract agreements found with given filter.'
+        'contract_agreement_page.no_agree_found' | translate
       "></empty-state>
   </div>
 
@@ -79,7 +90,8 @@
     *ngIf="page.isReady && !!page.data.contractAgreements.length"
     class="flex flex-col space-y-[20px]">
     <ng-container *ngIf="page.data.consumingContractAgreements.length">
-      <horizontal-section-divider text="Consuming Contract Agreements">
+      <horizontal-section-divider
+        text="{{ 'contract_agreement_page.con_agree' | translate }}">
       </horizontal-section-divider>
 
       <contract-agreement-cards
@@ -90,7 +102,8 @@
     </ng-container>
 
     <ng-container *ngIf="page.data.providingContractAgreements.length">
-      <horizontal-section-divider text="Providing Contract Agreements">
+      <horizontal-section-divider
+        text="{{ 'contract_agreement_page.prov_agree' | translate }}">
       </horizontal-section-divider>
 
       <contract-agreement-cards
diff --git a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog.component.html b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog.component.html
index 3718b68e7..b887a9ace 100644
--- a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog.component.html
+++ b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog.component.html
@@ -1,12 +1,23 @@
-<h1 mat-dialog-title>Initiate Transfer</h1>
+<!--
+  ~ Copyright (c) 2021-2024. sovity GmbH
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
+<h1 mat-dialog-title>
+  {{ 'contract_agreement_page.ini_transfer' | translate }}
+</h1>
 <mat-dialog-content class="w-[800px]">
   <form [formGroup]="form.all">
     <div class="flex flex-col mt-[10px]">
-      <div class="form-section-title">Datasink</div>
+      <div class="form-section-title">
+        {{ 'contract_agreement_page.datasink' | translate }}
+      </div>
 
       <!-- Data Address Type -->
       <data-address-type-select
-        label="Type"
+        label="{{ 'general.type' | translate }}"
         mode="Datasink"
         [control]="
           form.all.controls.dataAddressType
@@ -20,7 +31,9 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
           let ctrl
         "
         color="accent">
-        <mat-label>Custom Datasink Config (JSON)</mat-label>
+        <mat-label>{{
+          'contract_agreement_page.cus_datasink' | translate
+        }}</mat-label>
         <textarea
           matInput
           placeholder='{"https://w3id.org/edc/v0.0.1/ns/type": "HttpData", ...}'
@@ -38,14 +51,15 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
           let ctrl
         "
         color="accent">
-        <mat-label>Custom Transfer Process Request (JSON)</mat-label>
+        <mat-label>{{
+          'contract_agreement_page.cus_tranfer' | translate
+        }}</mat-label>
         <textarea matInput [formControl]="ctrl" [placeholder]="'{}'"></textarea>
         <mat-error *ngIf="ctrl.invalid && ctrl.errors?.jsonInvalid">
           {{ validationMessages.invalidJsonMessage }}
         </mat-error>
         <mat-hint>
-          JSON-LD values for "edc:connectorId", "edc:contractId",
-          "edc:connectorId" and "edc:connectorAddress" will be overridden.
+          {{ 'contract_agreement_page.json_hint' | translate }}
         </mat-hint>
       </mat-form-field>
 
@@ -57,7 +71,7 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
           <mat-form-field
             *ngIf="form.all.controls.httpMethod; let ctrl"
             class="w-1/3">
-            <mat-label>Method</mat-label>
+            <mat-label>{{ 'general.method' | translate }}</mat-label>
             <mat-select [formControl]="ctrl">
               <mat-option
                 *ngFor="let method of dataSinkMethods"
@@ -78,7 +92,7 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
           </mat-form-field>
         </div>
 
-        <div class="form-section-title">Authentication</div>
+        <div class="form-section-title">{{ 'general.auth' | translate }}</div>
 
         <!-- Add Authentication Button -->
         <div
@@ -90,7 +104,7 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
             (click)="
               form.all.controls.httpAuthHeaderType.setValue('Vault-Secret')
             ">
-            Add Authentication
+            {{ 'general.add_auth' | translate }}
           </button>
         </div>
 
@@ -101,9 +115,11 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
           <mat-label>Type</mat-label>
           <mat-select [formControl]="form.all.controls.httpAuthHeaderType">
             <mat-option value="Vault-Secret">
-              Header with Vault Secret
+              {{ 'general.header_sec' | translate }}
             </mat-option>
-            <mat-option value="Value">Header with Value</mat-option>
+            <mat-option value="Value">{{
+              'general.header_val' | translate
+            }}</mat-option>
           </mat-select>
         </mat-form-field>
         <div
@@ -111,7 +127,7 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
           class="flex flex-row space-x-[10px]">
           <!-- Auth Header Name -->
           <mat-form-field class="w-1/3">
-            <mat-label>Auth Header Name</mat-label>
+            <mat-label>{{ 'general.auth_header' | translate }}</mat-label>
             <input
               matInput
               placeholder="Authorization"
@@ -122,7 +138,7 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
           <mat-form-field
             *ngIf="form.all.controls.httpAuthHeaderType.value === 'Value'"
             class="grow">
-            <mat-label>Auth Header Value</mat-label>
+            <mat-label>{{ 'general.auth_value' | translate }}</mat-label>
             <input
               matInput
               placeholder="Bearer ..."
@@ -135,7 +151,7 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
               form.all.controls.httpAuthHeaderType.value === 'Vault-Secret'
             "
             class="grow">
-            <mat-label>Vault Secret Name</mat-label>
+            <mat-label>{{ 'general.vault_secret' | translate }}</mat-label>
             <input
               matInput
               placeholder="MySecret123"
@@ -151,11 +167,13 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
             mat-button
             color="warn"
             (click)="form.all.controls.httpAuthHeaderType.setValue('None')">
-            Remove Authentication
+            {{ 'general.rem_auth' | translate }}
           </button>
         </div>
 
-        <div class="form-section-title">Additional Headers</div>
+        <div class="form-section-title">
+          {{ 'general.add_header' | translate }}
+        </div>
 
         <div
           *ngFor="
@@ -165,7 +183,7 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
           class="flex flex-row space-x-[10px]">
           <!-- Header Name -->
           <mat-form-field class="w-1/3">
-            <mat-label>Header Name</mat-label>
+            <mat-label>{{ 'general.header_name' | translate }}</mat-label>
             <input
               matInput
               placeholder="Header"
@@ -174,7 +192,7 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
 
           <!-- Header Value -->
           <mat-form-field class="grow">
-            <mat-label>Header Value</mat-label>
+            <mat-label>{{ 'general.header_value' | translate }}</mat-label>
             <input
               matInput
               placeholder="..."
@@ -187,7 +205,7 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
             color="warn"
             style="height: 54px; margin-top: 4px; margin-left: 8px"
             (click)="form.onHttpHeadersRemoveClick(i)">
-            Remove
+            {{ 'general.remove' | translate }}
           </button>
         </div>
 
@@ -197,29 +215,25 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
             mat-button
             color="accent"
             (click)="form.onHttpHeadersAddClick()">
-            Add Additional Header
+            {{ 'general.add_add_header' | translate }}
           </button>
         </div>
       </ng-container>
 
       <ng-container
         *ngIf="form.dataAddressType !== 'Custom-Transfer-Process-Request'">
-        <div class="form-section-title">HTTP Datasource Parameterization</div>
+        <div class="form-section-title">
+          {{ 'contract_agreement_page.http_para' | translate }}
+        </div>
 
         <div class="text-sm mb-[10px] px-[3px]">
-          When the data offer on the provider side is of the type
-          <b>HttpData</b> and certain data source fields are set, certain parts
-          of the request to the data source can be customized from the consumer
-          side and will be passed to the other connector when initiating the
-          transfer. This allows an asset to contain more than just one kind of
-          data, allowing additional filtering or even sharing of entire APIs
-          with multiple data sets via a single asset and a single contract.
+          {{ 'contract_agreement_page.http_message' | translate }}
         </div>
 
         <div
           *ngIf="proxyPath || proxyMethod"
           class="text-sm mb-[10px] px-[3px]">
-          The resulting URL will look like
+          {{ 'contract_agreement_page.res_url' | translate }}
           <i>{{
             '{baseUrl}{customSubPath}?{baseQueryParams}&{customQueryParams}'
           }}</i>
@@ -233,8 +247,14 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
             <mat-form-field
               *ngIf="form.all.controls.httpProxiedMethod; let ctrl"
               [ngClass]="{'w-1/3': proxyPath}">
-              <mat-label>Custom Method</mat-label>
-              <mat-select placeholder="Custom Method" [formControl]="ctrl">
+              <mat-label>{{
+                'contract_agreement_page.cus_meth' | translate
+              }}</mat-label>
+              <mat-select
+                placeholder="{{
+                  'contract_agreement_page.cus_meth' | translate
+                }}"
+                [formControl]="ctrl">
                 <mat-option></mat-option>
                 <mat-option
                   *ngFor="let method of dataSourceMethods"
@@ -242,7 +262,11 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
                   >{{ method }}</mat-option
                 >
               </mat-select>
-              <mat-hint> Requires "proxyMethod" to be "true". </mat-hint>
+              <mat-hint>
+                {{
+                  'contract_agreement_page.proxy_method' | translate
+                }}</mat-hint
+              >
             </mat-form-field>
           </ng-container>
 
@@ -251,12 +275,16 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
             <mat-form-field
               *ngIf="form.all.controls.httpProxiedPath; let ctrl"
               class="grow">
-              <mat-label>Custom Subpath</mat-label>
+              <mat-label>{{
+                'contract_agreement_page.cus_sub' | translate
+              }}</mat-label>
               <input
                 matInput
                 [formControl]="ctrl"
                 [placeholder]="'sub-path/endpoint'" />
-              <mat-hint> Requires "proxyPath" to be "true". </mat-hint>
+              <mat-hint>{{
+                'contract_agreement_page.proxy_path' | translate
+              }}</mat-hint>
             </mat-form-field>
           </ng-container>
         </div>
@@ -270,19 +298,23 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
             class="flex flex-row space-x-[10px]">
             <!-- Query Param Name -->
             <mat-form-field class="w-1/3">
-              <mat-label>Custom Query Param Name</mat-label>
+              <mat-label>{{
+                'contract_agreement_page.cus_query' | translate
+              }}</mat-label>
               <input
                 matInput
                 placeholder="key"
                 required
                 autocomplete="new-query-param-name"
                 [formControl]="header.controls.paramName" />
-              <mat-hint> Requires "proxyQueryParams" to be "true". </mat-hint>
+              <mat-hint>
+                {{ 'contract_agreement_page.proxy_query' | translate }}
+              </mat-hint>
             </mat-form-field>
 
             <!-- Query Param Value -->
             <mat-form-field class="grow">
-              <mat-label>Value</mat-label>
+              <mat-label>{{ 'general.value' | translate }}</mat-label>
               <input
                 matInput
                 placeholder="..."
@@ -296,7 +328,7 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
               color="warn"
               style="height: 54px; margin-top: 4px; margin-left: 8px"
               (click)="form.onHttpQueryParamsRemoveClick(i)">
-              Remove
+              {{ 'general.remove' | translate }}
             </button>
           </div>
 
@@ -306,7 +338,7 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
               mat-button
               color="accent"
               (click)="form.onHttpQueryParamsAddClick()">
-              Add Custom Query Param
+              {{ 'contract_agreement_page.add_cus_query' | translate }}
             </button>
           </div>
         </ng-container>
@@ -314,24 +346,32 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
         <ng-container *ngIf="proxyBody">
           <!-- Request Body Content Type -->
           <mat-form-field class="grow">
-            <mat-label>Custom Request Body Content Type</mat-label>
+            <mat-label>{{
+              'contract_agreement_page.req_cont' | translate
+            }}</mat-label>
             <input
               matInput
               autocomplete="new-content-type"
               [formControl]="form.all.controls.httpProxiedBodyContentType"
               [placeholder]="'application/json'" />
-            <mat-hint> Requires "proxyBody" to be "true". </mat-hint>
+            <mat-hint>
+              {{ 'contract_agreement_page.proxy_body' | translate }}
+            </mat-hint>
           </mat-form-field>
 
           <!-- Request Body -->
           <mat-form-field *ngIf="form.all.controls.httpProxiedBody; let ctrl">
-            <mat-label>Custom Request Body</mat-label>
+            <mat-label>{{
+              'contract_agreement_page.req_body' | translate
+            }}</mat-label>
             <textarea
               matInput
               placeholder='{"some": "request-body"}'
               autocomplete="new-request-body"
               [formControl]="ctrl"></textarea>
-            <mat-hint> Requires "proxyBody" to be "true". </mat-hint>
+            <mat-hint>
+              {{ 'contract_agreement_page.proxy_body' | translate }}</mat-hint
+            >
           </mat-form-field>
         </ng-container>
 
@@ -347,8 +387,12 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
             mat-button
             [color]="ctrl.value ? 'warn' : 'accent'"
             (click)="ctrl.setValue(!ctrl.value)">
-            {{ ctrl.value ? 'Hide' : 'Show' }} Http Datasource Parameterization
-            Fields
+            {{
+              ctrl.value
+                ? ('general.hide' | translate)
+                : ('general.show' | translate)
+            }}
+            {{ 'contract_agreement_page.http_fields' | translate }}
           </button>
         </div>
       </ng-container>
@@ -362,7 +406,7 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
     color="default"
     [mat-dialog-close]="null"
     [disabled]="loading">
-    Cancel
+    {{ 'general.cancel' | translate }}
   </button>
 
   <button
@@ -370,6 +414,6 @@ <h1 mat-dialog-title>Initiate Transfer</h1>
     color="primary"
     [disabled]="!form.all.valid || loading"
     (click)="onSave()">
-    Initiate Transfer
+    {{ 'contract_agreement_page.ini_transfer' | translate }}
   </button>
 </mat-dialog-actions>
diff --git a/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.html b/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.html
index 2b364ddda..fa793d69a 100644
--- a/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.html
+++ b/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.html
@@ -1,3 +1,10 @@
+<!--
+  ~ Copyright (c) 2021-2024. sovity GmbH
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
 <div class="flex flex-row flex-wrap gap-[16px] justify-start">
   <mat-card
     *ngFor="let card of contractDefinitionCards"
@@ -12,12 +19,16 @@
           {{ card.id }}
         </a>
       </mat-card-title>
-      <mat-card-subtitle>Contract Definition</mat-card-subtitle>
+      <mat-card-subtitle
+        ><mat-card-subtitle>{{
+          'general.con_def' | translate
+        }}</mat-card-subtitle></mat-card-subtitle
+      >
     </mat-card-header>
     <mat-card-content class="flex flex-col space-y-[16px]">
       <div class="flex flex-col">
         <div class="text-slate text-sm uppercase tracking-wider">
-          Access Policy
+          {{ 'general.access_pol' | translate }}
         </div>
         <div>
           <a
@@ -34,7 +45,7 @@
       </div>
       <div class="flex flex-col">
         <div class="text-slate text-sm uppercase tracking-wider">
-          Contract Policy
+          {{ 'general.policy' | translate }}
         </div>
         <div>
           <a
diff --git a/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.ts b/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.ts
index 5494059e6..25e910285 100644
--- a/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.ts
+++ b/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.ts
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {
   Component,
   EventEmitter,
@@ -9,6 +15,7 @@ import {
 import {MatDialog, MatDialogRef} from '@angular/material/dialog';
 import {EMPTY, Subject} from 'rxjs';
 import {catchError, filter, tap} from 'rxjs/operators';
+import {TranslateService} from '@ngx-translate/core';
 import {PolicyDefinitionDto} from '@sovity.de/edc-client';
 import {AssetDetailDialogDataService} from '../../../../component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.service';
 import {AssetDetailDialogService} from '../../../../component-library/catalog/asset-detail-dialog/asset-detail-dialog.service';
@@ -45,6 +52,7 @@ export class ContractDefinitionCardsComponent implements OnDestroy {
     private assetDetailDialogService: AssetDetailDialogService,
     private matDialog: MatDialog,
     private notificationService: NotificationService,
+    private translateService: TranslateService,
   ) {}
 
   onPolicyClick(policyDefinition: PolicyDefinitionDto) {
@@ -78,6 +86,7 @@ export class ContractDefinitionCardsComponent implements OnDestroy {
         confirmation: ConfirmDialogModel.forDelete(
           'contract definition',
           card.id,
+          this.translateService,
         ),
         action: () =>
           this.edcApiService.deleteContractDefinition(card.id).pipe(
diff --git a/src/app/routes/connector-ui/contract-definition-page/contract-definition-editor-dialog/contract-definition-editor-dialog.component.html b/src/app/routes/connector-ui/contract-definition-page/contract-definition-editor-dialog/contract-definition-editor-dialog.component.html
index a7c43daa4..e56cce859 100644
--- a/src/app/routes/connector-ui/contract-definition-page/contract-definition-editor-dialog/contract-definition-editor-dialog.component.html
+++ b/src/app/routes/connector-ui/contract-definition-page/contract-definition-editor-dialog/contract-definition-editor-dialog.component.html
@@ -1,4 +1,11 @@
-<h1 mat-dialog-title>Create New Contract Definition</h1>
+<!--
+  ~ Copyright (c) 2021-2024. sovity GmbH
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
+<h1 mat-dialog-title>{{ 'contract_agreement_page.new_def' | translate }}</h1>
 
 <mat-dialog-content class="w-[800px]">
   <div class="flex flex-col mt-[10px]">
@@ -16,20 +23,20 @@ <h1 mat-dialog-title>Create New Contract Definition</h1>
 
     <!-- Access Policy -->
     <policy-select
-      label="Access Policy"
+      label="{{ 'general.access_pol' | translate }}"
       [control]="form.group.controls.accessPolicy"
       [policies]="policies"></policy-select>
 
     <!-- Contract Policy -->
     <policy-select
-      label="Contract Policy"
+      label="{{ 'general.policy' | translate }}"
       [control]="form.group.controls.contractPolicy"
       [policies]="policies"></policy-select>
 
     <!-- Assets -->
     <asset-select
       *ngIf="form.group.controls.assets; let ctrl"
-      label="Assets"
+      label="{{ 'general.assets' | translate }}"
       [control]="form.group.controls.assets"
       [assets]="assets"></asset-select>
   </div>
@@ -37,7 +44,7 @@ <h1 mat-dialog-title>Create New Contract Definition</h1>
 
 <mat-dialog-actions class="flex flex-row justify-end">
   <button mat-button [mat-dialog-close]="null" [disabled]="loading">
-    Cancel
+    {{ 'general.cancel' | translate }}
   </button>
 
   <button
@@ -45,6 +52,6 @@ <h1 mat-dialog-title>Create New Contract Definition</h1>
     mat-raised-button
     [disabled]="loading || !form.group.valid"
     (click)="onCreate()">
-    Create
+    {{ 'general.create' | translate }}
   </button>
 </mat-dialog-actions>
diff --git a/src/app/routes/connector-ui/contract-definition-page/contract-definition-page.module.ts b/src/app/routes/connector-ui/contract-definition-page/contract-definition-page.module.ts
index 2791500c1..26db52a58 100644
--- a/src/app/routes/connector-ui/contract-definition-page/contract-definition-page.module.ts
+++ b/src/app/routes/connector-ui/contract-definition-page/contract-definition-page.module.ts
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
@@ -18,6 +24,7 @@ import {MatSlideToggleModule} from '@angular/material/slide-toggle';
 import {MatStepperModule} from '@angular/material/stepper';
 import {MatTooltipModule} from '@angular/material/tooltip';
 import {RouterModule} from '@angular/router';
+import {TranslateModule} from '@ngx-translate/core';
 import {CatalogModule} from '../../../component-library/catalog/catalog.module';
 import {JsonDialogModule} from '../../../component-library/json-dialog/json-dialog.module';
 import {PipesAndDirectivesModule} from '../../../component-library/pipes-and-directives/pipes-and-directives.module';
@@ -35,7 +42,7 @@ import {PolicySelectComponent} from './policy-select/policy-select.component';
     FormsModule,
     ReactiveFormsModule,
     RouterModule,
-
+    TranslateModule,
     // Angular Material
     MatBadgeModule,
     MatButtonModule,
diff --git a/src/app/routes/connector-ui/contract-definition-page/contract-definition-page/contract-definition-page.component.html b/src/app/routes/connector-ui/contract-definition-page/contract-definition-page/contract-definition-page.component.html
index e8e4f1444..4794074e1 100644
--- a/src/app/routes/connector-ui/contract-definition-page/contract-definition-page/contract-definition-page.component.html
+++ b/src/app/routes/connector-ui/contract-definition-page/contract-definition-page/contract-definition-page.component.html
@@ -1,3 +1,10 @@
+<!--
+  ~ Copyright (c) 2021-2024. sovity GmbH
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
 <div id="wrapper">
   <div class="flex flex-row">
     <!-- Search -->
@@ -5,7 +12,9 @@
       class="search-form-field"
       appearance="outline"
       color="accent">
-      <mat-label>Search contract definitions</mat-label>
+      <mat-label>{{
+        'contract_agreement_page.search_def' | translate
+      }}</mat-label>
       <input matInput [formControl]="searchText" />
       <mat-icon matPrefix>search</mat-icon>
       <button
@@ -25,7 +34,7 @@
       style="margin-top: 8px; height: 44px"
       (click)="onCreate()">
       <mat-icon>add_circle_outline</mat-icon>
-      Create Contract Definition
+      {{ 'contract_agreement_page.create_def' | translate }}
     </button>
 
     <!-- Spacer -->
@@ -58,7 +67,7 @@
       "
       class="min-h-[35rem]"
       [emptyMessage]="
-        'No contract definition found with given filter.'
+        'contract_agreement_page.con_def' | translate
       "></empty-state>
   </div>
   <contract-definition-cards
diff --git a/src/app/routes/connector-ui/dashboard-page/dashboard-page.module.ts b/src/app/routes/connector-ui/dashboard-page/dashboard-page.module.ts
index c27b51190..a4395f967 100644
--- a/src/app/routes/connector-ui/dashboard-page/dashboard-page.module.ts
+++ b/src/app/routes/connector-ui/dashboard-page/dashboard-page.module.ts
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {ClipboardModule} from '@angular/cdk/clipboard';
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
@@ -19,6 +25,7 @@ import {MatSlideToggleModule} from '@angular/material/slide-toggle';
 import {MatStepperModule} from '@angular/material/stepper';
 import {MatTooltipModule} from '@angular/material/tooltip';
 import {RouterModule} from '@angular/router';
+import {TranslateModule} from '@ngx-translate/core';
 import {NgChartsModule} from 'ng2-charts';
 import {NgxJsonViewerModule} from 'ngx-json-viewer';
 import {PipesAndDirectivesModule} from '../../../component-library/pipes-and-directives/pipes-and-directives.module';
@@ -35,7 +42,7 @@ import {DashboardPageComponent} from './dashboard-page/dashboard-page.component'
     FormsModule,
     ReactiveFormsModule,
     RouterModule,
-
+    TranslateModule,
     // Angular CDK
     ClipboardModule,
 
diff --git a/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page-data.service.ts b/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page-data.service.ts
index 2ade48133..a0d97d74f 100644
--- a/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page-data.service.ts
+++ b/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page-data.service.ts
@@ -1,6 +1,13 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {Injectable} from '@angular/core';
 import {Observable, combineLatest, merge, of, sampleTime, scan} from 'rxjs';
 import {catchError, map} from 'rxjs/operators';
+import {TranslateService} from '@ngx-translate/core';
 import {DashboardTransferAmounts, UiDataOffer} from '@sovity.de/edc-client';
 import {EdcApiService} from '../../../../core/services/api/edc-api.service';
 import {LastCommitInfoService} from '../../../../core/services/api/last-commit-info.service';
@@ -17,6 +24,7 @@ export class DashboardPageDataService {
     private catalogApiUrlService: CatalogApiUrlService,
     private lastCommitInfoService: LastCommitInfoService,
     private connectorInfoPropertyGridGroupBuilder: ConnectorInfoPropertyGridGroupBuilder,
+    private translateService: TranslateService,
   ) {}
 
   /**
@@ -43,7 +51,9 @@ export class DashboardPageDataService {
     return this.getAllDataOffers().pipe(
       map((dataOffers) => dataOffers.length),
       Fetched.wrap({
-        failureMessage: 'Failed fetching data offers.',
+        failureMessage: this.translateService.instant(
+          'dashboard_page.failed_offers',
+        ),
       }),
       map((numOffers) => ({numCatalogEntries: numOffers})),
     );
@@ -77,22 +87,37 @@ export class DashboardPageDataService {
     direction: 'CONSUMING' | 'PROVIDING',
   ): DonutChartData {
     const amounts: {label: string; amount: number; color: string}[] = [
-      {label: 'Completed', amount: transfers.numOk, color: '#b2e061'},
-      {label: 'In Progress', amount: transfers.numRunning, color: '#7eb0d5'},
-      {label: 'Error', amount: transfers.numError, color: '#fd7f6f'},
+      {
+        label: this.translateService.instant('dashboard_page.completed'),
+        amount: transfers.numOk,
+        color: '#b2e061',
+      },
+      {
+        label: this.translateService.instant('dashboard_page.progress'),
+        amount: transfers.numRunning,
+        color: '#7eb0d5',
+      },
+      {
+        label: this.translateService.instant('dashboard_page.error'),
+        amount: transfers.numError,
+        color: '#fd7f6f',
+      },
     ].filter((it) => it.amount);
 
     const total = transfers.numTotal;
-
+    const emptyMessage =
+      direction === 'CONSUMING'
+        ? this.translateService.instant('dashboard_page.no_transfer')
+        : this.translateService.instant('dashboard_page.no_transfer2');
     return {
-      totalLabel: 'Total',
+      totalLabel: this.translateService.instant('general.total'),
       totalValue: total,
       isEmpty: !total,
-      emptyMessage: `No ${direction} transfer processes.`,
+      emptyMessage: emptyMessage,
       labels: amounts.map((it) => it.label),
       datasets: [
         {
-          label: 'Number of Transfer Processes',
+          label: this.translateService.instant('dashboard_page.num_transfer'),
           data: amounts.map((it) => it.amount),
           backgroundColor: amounts.map((it) => it.color),
         },
@@ -105,22 +130,30 @@ export class DashboardPageDataService {
     return combineLatest([
       this.lastCommitInfoService.getLastCommitInfoData().pipe(
         Fetched.wrap({
-          failureMessage: 'Failed fetching Env and Jar Last Commit Data',
+          failureMessage: this.translateService.instant(
+            'dashboard_page.failed_env',
+          ),
         }),
       ),
       this.lastCommitInfoService.getUiBuildDateDetails().pipe(
         Fetched.wrap({
-          failureMessage: 'Failed fetching UI Last Build Date Data',
+          failureMessage: this.translateService.instant(
+            'dashboard_page.failed_ui_build',
+          ),
         }),
       ),
       this.lastCommitInfoService.getUiCommitDetails().pipe(
         Fetched.wrap({
-          failureMessage: 'Failed fetching UI Last Commit Data',
+          failureMessage: this.translateService.instant(
+            'dashboard_page.failed_ui',
+          ),
         }),
       ),
       this.edcApiService.getDashboardPage().pipe(
         Fetched.wrap({
-          failureMessage: 'Failed fetching Dashboard Page Data',
+          failureMessage: this.translateService.instant(
+            'dashboard_page.failed_dashboard',
+          ),
         }),
       ),
     ]).pipe(
diff --git a/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page.component.html b/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page.component.html
index 0e6c3a83d..22249f70a 100644
--- a/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page.component.html
+++ b/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page.component.html
@@ -1,9 +1,20 @@
+<!--
+  ~ Copyright (c) 2021-2024. sovity GmbH
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
 <div class="flex flex-row gap-[16px]" style="margin: 24px">
   <div class="grow flex flex-col gap-[16px]">
     <div class="flex flex-row gap-[16px]">
       <mat-card style="width: calc(50% - 8px)">
-        <mat-card-title>Incoming Data</mat-card-title>
-        <mat-card-subtitle>Transfer Processes</mat-card-subtitle>
+        <mat-card-title>{{
+          'dashboard_page.inc_data' | translate
+        }}</mat-card-title>
+        <mat-card-subtitle>{{
+          'dashboard_page.trans_pro' | translate
+        }}</mat-card-subtitle>
         <div class="flex flex-row justify-center items-center">
           <dashboard-donut-chart
             [data]="data.incomingTransfersChart"></dashboard-donut-chart>
@@ -11,8 +22,12 @@
       </mat-card>
 
       <mat-card style="width: calc(50% - 8px)">
-        <mat-card-title>Outgoing Data</mat-card-title>
-        <mat-card-subtitle>Transfer Processes</mat-card-subtitle>
+        <mat-card-title>{{
+          'dashboard_page.out_data' | translate
+        }}</mat-card-title>
+        <mat-card-subtitle>{{
+          'dashboard_page.trans_pro' | translate
+        }}</mat-card-subtitle>
         <div class="flex flex-row justify-center items-center">
           <dashboard-donut-chart
             [data]="data.outgoingTransfersChart"></dashboard-donut-chart>
@@ -23,33 +38,37 @@
     <div class="flex flex-row flex-wrap gap-[16px]">
       <dashboard-kpi-card
         class="flex-even-sized"
-        label="Your Contract Definitions"
+        [label]="'dashboard_page.your_def' | translate"
         [kpi]="data.numContractDefinitions"></dashboard-kpi-card>
 
       <dashboard-kpi-card
         class="flex-even-sized"
-        label="Your Assets"
+        [label]="'dashboard_page.your_assets' | translate"
         [kpi]="data.numAssets"></dashboard-kpi-card>
 
       <dashboard-kpi-card
         class="flex-even-sized"
-        label="Your Policies"
+        [label]="'dashboard_page.your_pol' | translate"
         [kpi]="data.numPolicies"></dashboard-kpi-card>
 
       <dashboard-kpi-card
         class="flex-even-sized"
-        label="Preconfigured Catalogs"
+        [label]="'dashboard_page.pre_cat' | translate"
         [kpi]="data.numCatalogs"></dashboard-kpi-card>
 
       <dashboard-kpi-card
         class="flex-even-sized"
-        label="Contract Agreements"
+        [label]="'dashboard_page.con_agree' | translate"
         [kpi]="data.numContractAgreements"></dashboard-kpi-card>
     </div>
 
     <mat-card>
-      <mat-card-title>Connector Properties</mat-card-title>
-      <mat-card-subtitle>Additional Properties</mat-card-subtitle>
+      <mat-card-title>{{
+        'dashboard_page.conn_prop' | translate
+      }}</mat-card-title>
+      <mat-card-subtitle>{{
+        'dashboard_page.add_prop' | translate
+      }}</mat-card-subtitle>
       <property-grid-group
         class="mt-[15px]"
         [propGroups]="data.connectorProperties">
@@ -59,7 +78,9 @@
 
   <div class="shrink-0 flex flex-col gap-[16px]" style="width: 420px">
     <mat-card>
-      <mat-card-title>EDC Connector</mat-card-title>
+      <mat-card-title>{{
+        'dashboard_page.edc_conn' | translate
+      }}</mat-card-title>
       <mat-card-subtitle>
         {{ data.title }}
       </mat-card-subtitle>
@@ -67,12 +88,10 @@
         {{ data.description }}
       </p>
       <p class="text-justify">
-        Share the following Connector Endpoint to let others access your EDC
-        Connector's catalog. This is especially useful when using
-        connector-restricted data offers which won't show up in brokers.
+        {{ 'dashboard_page.descrip' | translate }}
       </p>
       <mat-form-field class="w-full" style="margin-bottom: -10px">
-        <mat-label>Connector Endpoint</mat-label>
+        <mat-label>{{ 'dashboard_page.conn_end' | translate }}</mat-label>
         <input
           #input
           matInput
@@ -84,13 +103,13 @@
         <button
           mat-icon-button
           matSuffix
-          matTooltip="Copy to clipboard"
+          matTooltip="{{ 'tooltip.clipboard' | translate }}"
           [cdkCopyToClipboard]="data.connectorEndpoint">
           <mat-icon>content_copy</mat-icon>
         </button>
       </mat-form-field>
       <mat-form-field class="w-full" style="margin-bottom: -10px">
-        <mat-label>Management API URL</mat-label>
+        <mat-label>{{ 'dashboard_page.api_url' | translate }}</mat-label>
         <input
           #endpointInput
           matInput
@@ -102,7 +121,7 @@
         <button
           mat-icon-button
           matSuffix
-          matTooltip="Copy to clipboard"
+          matTooltip="{{ 'tooltip.clipboard' | translate }}"
           [cdkCopyToClipboard]="config.shownManagementApiUrl">
           <mat-icon>content_copy</mat-icon>
         </button>
@@ -121,17 +140,17 @@
             src="/assets/images/sovity_logo.svg"
             alt="sovity logo" /></span
       ></mat-card-title>
-      <mat-card-subtitle>Basic Edition EDC</mat-card-subtitle>
+      <mat-card-subtitle>{{
+        'dashboard_page.edition_edc' | translate
+      }}</mat-card-subtitle>
 
       <div class="flex flex-row h-fit">
         <div>
           <p class="text-justify mx-2">
-            This EDC Connector on the subscription level "Basic" is provided by
-            sovity to enable your first steps in the Mobility Data Space (MDS).
+            {{ 'dashboard_page.descrip2' | translate }}
           </p>
           <p class="text-justify mx-2">
-            For additional features and advanced capacities, please feel free to
-            contact us.
+            {{ 'dashboard_page.descrip3' | translate }}
           </p>
         </div>
       </div>
@@ -141,21 +160,23 @@
           href="https://sovity.de/en/contact/"
           mat-stroked-button
           target="_blank">
-          Contact us
+          {{ 'dashboard_page.contact' | translate }}
         </a>
       </div>
     </mat-card>
 
     <mat-card *ngIf="'open-source-marketing' | isActiveFeature">
-      <mat-card-title>Get Managed EDC</mat-card-title>
-      <mat-card-subtitle>Connector-as-a-Service</mat-card-subtitle>
+      <mat-card-title>{{
+        'dashboard_page.managed_edc' | translate
+      }}</mat-card-title>
+      <mat-card-subtitle>{{
+        'dashboard_page.conn_service' | translate
+      }}</mat-card-subtitle>
       <div>
         <p class="text-justify">
-          To join data spaces like <b>Mobility Data Space</b> or
-          <b>Catena-X</b> within minutes, consider the managed solution by
+          {{ 'dashboard_page.descrip4' | translate }}
           <a class="link" href="https://sovity.de" target="_blank">sovity</a>
-          - the <b>Connector-as-a-Service (CaaS)</b> based on open-source
-          software enriched with <b>key enterprise features</b>.
+          {{ 'dashboard_page.descrip5' | translate }}
         </p>
         <div class="flex flex-row !space-x-[10px]">
           <a
@@ -163,7 +184,7 @@
             href="mailto:contact@sovity.de"
             mat-flat-button
             target="_blank">
-            Contact
+            {{ 'dashboard_page.contact' | translate }}
           </a>
           <a
             color="secondary"
@@ -176,20 +197,19 @@
       </div>
     </mat-card>
     <mat-card>
-      <mat-card-title>About EDC</mat-card-title>
-      <mat-card-subtitle>Eclipse Dataspace Components</mat-card-subtitle>
+      <mat-card-title>{{ 'dashboard_page.about' | translate }}</mat-card-title>
+      <mat-card-subtitle>{{
+        'dashboard_page.eclipse' | translate
+      }}</mat-card-subtitle>
       <div>
         <p class="text-justify">
-          The <b>Eclipse Dataspace Components</b> framework facilitates
-          sovereign, inter-organizational data exchange.
+          {{ 'dashboard_page.descrip6' | translate }}
         </p>
         <p class="text-justify">
-          It implements the <b>International Data Spaces</b> standard (IDS) as
-          well as relevant protocols associated with <b>GAIA-X</b>.
+          {{ 'dashboard_page.descrip7' | translate }}
         </p>
         <p class="text-justify">
-          The framework is designed as extensible as possible to encourage
-          integrations into various data ecosystems.
+          {{ 'dashboard_page.descrip8' | translate }}
         </p>
         <div class="flex flex-row !space-x-[10px]">
           <a
@@ -203,55 +223,95 @@
       </div>
     </mat-card>
     <mat-card>
-      <mat-card-title>About EDC UI</mat-card-title>
-      <mat-card-subtitle>Data Dashboard</mat-card-subtitle>
+      <mat-card-title>{{
+        'dashboard_page.about_ui' | translate
+      }}</mat-card-title>
+      <mat-card-subtitle>{{
+        'dashboard_page.data_dashboard' | translate
+      }}</mat-card-subtitle>
       <div>
         <p class="text-justify">
-          Example use cases, that you can try out with this application, are:
+          {{ 'dashboard_page.descrip9' | translate }}
         </p>
         <ul class="list-style-material-icons-check">
           <li>
-            View the asset catalog available to you in your Dataspace using the
-            <a class="link" [routerLink]="['/catalog-browser']"
-              >Catalog Browser</a
+            {{ 'dashboard_page.descrip10' | translate }}
+            <a
+              class="link"
+              style="display: inline"
+              [routerLink]="['/catalog-browser']">
+              {{ 'dashboard_page.catalog' | translate }}</a
             >
           </li>
           <li>
-            Negotiate a contract for data sharing in your Dataspace using the
-            <a class="link" [routerLink]="['/catalog-browser']"
-              >Catalog Browser</a
+            {{ 'dashboard_page.descrip11' | translate }}
+            <a
+              class="link"
+              style="display: inline"
+              [routerLink]="['/catalog-browser']"
+              >{{ 'dashboard_page.catalog' | translate }}</a
             >
           </li>
           <li>
-            View your existing contracts in the
-            <a class="link" [routerLink]="['/contracts']">Contracts</a> page
+            {{ 'dashboard_page.descrip17' | translate }}
+            <a
+              class="link"
+              style="display: inline"
+              [routerLink]="['/contracts']"
+              >{{ 'dashboard_page.contracts' | translate }}</a
+            >
+            {{ 'dashboard_page.page' | translate }}
           </li>
           <li>
-            Transfer an asset in your Dataspace using the
-            <a class="link" [routerLink]="['/contracts']">Contracts</a> page
+            {{ 'dashboard_page.descrip12' | translate }}
+            <a
+              class="link"
+              style="display: inline"
+              [routerLink]="['/contracts']"
+              >{{ 'dashboard_page.contracts' | translate }}</a
+            >
+            {{ 'dashboard_page.page' | translate }}
           </li>
           <li>
-            View which assets have been transferred in your Dataspace in the
-            <a class="link" [routerLink]="['/transfer-history']"
-              >Transfer History</a
+            {{ 'dashboard_page.descrip13' | translate }}
+            <a
+              class="link"
+              style="display: inline"
+              [routerLink]="['/transfer-history']"
+              >{{ 'dashboard_page.transfer' | translate }}</a
             >
-            page
+            {{ 'dashboard_page.page' | translate }}
           </li>
           <li>
-            View and create assets using the
-            <a class="link" [routerLink]="['/my-assets']">Assets</a> page
+            {{ 'dashboard_page.descrip14' | translate }}
+            <a
+              class="link"
+              style="display: inline"
+              [routerLink]="['/my-assets']"
+              >{{ 'general.assets' | translate }}</a
+            >
+            {{ 'dashboard_page.page' | translate }}
           </li>
+
           <li>
-            View and create policies and apply these to assets in your Dataspace
-            using the
-            <a class="link" [routerLink]="['/policies']">Policies</a> page
+            {{ 'dashboard_page.descrip15' | translate }}
+            <a
+              class="link"
+              style="display: inline"
+              [routerLink]="['/policies']"
+              >{{ 'general.policies' | translate }}</a
+            >
+            {{ 'dashboard_page.page' | translate }}
           </li>
           <li>
-            Publish a new asset into your Dataspace using the
-            <a class="link" [routerLink]="['/contract-definitions']"
-              >Contract Definitions</a
+            {{ 'dashboard_page.descrip16' | translate }}
+            <a
+              class="link"
+              style="display: inline"
+              [routerLink]="['/contract-definitions']"
+              >{{ 'dashboard_page.con_def' | translate }}</a
             >
-            page
+            {{ 'dashboard_page.page' | translate }}
           </li>
         </ul>
       </div>
diff --git a/src/app/routes/connector-ui/language-selector/language-selector.component.html b/src/app/routes/connector-ui/language-selector/language-selector.component.html
new file mode 100644
index 000000000..cd8f79a5f
--- /dev/null
+++ b/src/app/routes/connector-ui/language-selector/language-selector.component.html
@@ -0,0 +1,33 @@
+<!--
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
+<div class="container">
+  <mat-form-field>
+    <mat-label>{{ 'general.language' | translate }}</mat-label>
+    <div style="display: flex; align-items: center">
+      <img
+        *ngIf="selectedLanguage"
+        class="flag"
+        src="../../../../assets/images/flags/{{ selectedLanguage }}.svg"
+        alt="Selected Flag"
+        style="margin-right: 8px" />
+      <mat-select
+        [disableOptionCentering]="true"
+        [(value)]="selectedLanguage"
+        (selectionChange)="onLanguageChange()">
+        <mat-option
+          *ngFor="let language of supportedLanguages"
+          [value]="language.code">
+          <img
+            class="flag"
+            src="../../../../assets/images/flags/{{ language.code }}.svg"
+            alt="Custom Icon" />
+          {{ language.name }}
+        </mat-option>
+      </mat-select>
+    </div>
+  </mat-form-field>
+</div>
diff --git a/src/app/routes/connector-ui/language-selector/language-selector.component.scss b/src/app/routes/connector-ui/language-selector/language-selector.component.scss
new file mode 100644
index 000000000..15b9b70d0
--- /dev/null
+++ b/src/app/routes/connector-ui/language-selector/language-selector.component.scss
@@ -0,0 +1,16 @@
+/*!
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
+
+.container {
+  top: 0px;
+  right: 0px;
+  max-width: 150px;
+  text-align: right;
+}
+
+.flag {
+  height: 1em;
+}
diff --git a/src/app/routes/connector-ui/language-selector/language-selector.component.spec.ts b/src/app/routes/connector-ui/language-selector/language-selector.component.spec.ts
new file mode 100644
index 000000000..ab03cd2dc
--- /dev/null
+++ b/src/app/routes/connector-ui/language-selector/language-selector.component.spec.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
+import {ComponentFixture, TestBed} from '@angular/core/testing';
+import {LanguageSelectorComponent} from './language-selector.component';
+
+describe('LanguageSelectorComponent', () => {
+  let component: LanguageSelectorComponent;
+  let fixture: ComponentFixture<LanguageSelectorComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [LanguageSelectorComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(LanguageSelectorComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/connector-ui/language-selector/language-selector.component.ts b/src/app/routes/connector-ui/language-selector/language-selector.component.ts
new file mode 100644
index 000000000..c38e34998
--- /dev/null
+++ b/src/app/routes/connector-ui/language-selector/language-selector.component.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
+// language-selector.component.ts
+import {Component} from '@angular/core';
+import {TranslateService} from '@ngx-translate/core';
+
+@Component({
+  selector: 'app-language-selector',
+  templateUrl: './language-selector.component.html',
+  styleUrls: ['./language-selector.component.scss'],
+})
+export class LanguageSelectorComponent {
+  supportedLanguages = [
+    {code: 'en', name: 'English'},
+    {code: 'de', name: 'Deutsch'},
+    // Add more languages as needed
+  ];
+
+  selectedLanguage!: string;
+  constructor(private translateService: TranslateService) {}
+  ngOnInit(): void {
+    // Set the initial selected language from localStorage
+    this.selectedLanguage = localStorage.getItem('selectedLanguage') || 'en';
+    this.translateService.use(this.selectedLanguage);
+  }
+
+  onLanguageChange(): void {
+    // Update selected language in localStorage
+    localStorage.setItem('selectedLanguage', this.selectedLanguage);
+
+    this.translateService.use(this.selectedLanguage);
+  }
+}
diff --git a/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page.component.ts b/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page.component.ts
index 354ef8568..c5cf9447a 100644
--- a/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page.component.ts
+++ b/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page.component.ts
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {Component, OnDestroy} from '@angular/core';
 import {Router} from '@angular/router';
 import {Subject} from 'rxjs';
@@ -5,6 +11,7 @@ import {finalize, takeUntil} from 'rxjs/operators';
 import {PolicyDefinitionCreateDto} from '@sovity.de/edc-client';
 import {ExpressionFormControls} from '../../../../component-library/policy-editor/editor/expression-form-controls';
 import {ExpressionFormHandler} from '../../../../component-library/policy-editor/editor/expression-form-handler';
+import {TranslateService} from '@ngx-translate/core';
 import {EdcApiService} from '../../../../core/services/api/edc-api.service';
 import {NotificationService} from '../../../../core/services/notification.service';
 import {ValidationMessages} from '../../../../core/validators/validation-messages';
@@ -29,6 +36,7 @@ export class PolicyDefinitionCreatePageComponent implements OnDestroy {
     public validationMessages: ValidationMessages,
     private edcApiService: EdcApiService,
     private notificationService: NotificationService,
+    private translateService: TranslateService,
   ) {}
 
   onSave() {
@@ -46,12 +54,13 @@ export class PolicyDefinitionCreatePageComponent implements OnDestroy {
       )
       .subscribe({
         complete: () => {
-          this.notificationService.showInfo('Successfully created policy.');
+          this.notificationService.showInfo(this.translateService.instant('notification.succ_pol'));
           this.router.navigate(['/policies']);
         },
         error: (error) => {
-          console.error('Failed creating Policy!', error);
-          this.notificationService.showError('Failed creating policy!');
+          const fai_pol = this.translateService.instant('notification.fai_pol');
+          console.error(fai_pol, error);
+          this.notificationService.showError(fai_pol);
         },
       });
   }
diff --git a/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.html b/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.html
index a0fabfb9b..97b26e654 100644
--- a/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.html
+++ b/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.html
@@ -1,3 +1,10 @@
+<!--
+  ~ Copyright (c) 2021-2024. sovity GmbH
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
 <div class="flex flex-row flex-wrap gap-[16px] justify-start">
   <mat-card
     *ngFor="let policyCard of policyCards"
@@ -12,7 +19,7 @@
           {{ policyCard.id }}
         </a>
       </mat-card-title>
-      <mat-card-subtitle>Policy</mat-card-subtitle>
+      <mat-card-subtitle>{{ 'general.pol' | translate }}</mat-card-subtitle>
     </mat-card-header>
     <mat-card-content class="flex flex-col space-y-[16px]">
       <app-policy-renderer
diff --git a/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.ts b/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.ts
index 7a2de31d4..6d2246348 100644
--- a/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.ts
+++ b/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.ts
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {
   Component,
   EventEmitter,
@@ -8,6 +14,7 @@ import {
 import {MatDialog, MatDialogRef} from '@angular/material/dialog';
 import {EMPTY} from 'rxjs';
 import {catchError, tap} from 'rxjs/operators';
+import {TranslateService} from '@ngx-translate/core';
 import {ConfirmDialogModel} from '../../../../component-library/confirmation-dialog/confirmation-dialog/confirmation-dialog.component';
 import {JsonDialogComponent} from '../../../../component-library/json-dialog/json-dialog/json-dialog.component';
 import {JsonDialogData} from '../../../../component-library/json-dialog/json-dialog/json-dialog.data';
@@ -38,19 +45,24 @@ export class PolicyCardsComponent {
     private edcApiService: EdcApiService,
     private matDialog: MatDialog,
     private notificationService: NotificationService,
+    private translateService: TranslateService,
   ) {}
 
   onPolicyDetailClick(policyCard: PolicyCard) {
     let dialogRef: MatDialogRef<any>;
     const data: JsonDialogData = {
       title: policyCard.id,
-      subtitle: 'Policy',
+      subtitle: this.translateService.instant('general.pol'),
       icon: 'policy',
       objectForJson: policyCard.objectForJson,
       toolbarButton: {
-        text: 'Delete',
+        text: this.translateService.instant('general.delete'),
         icon: 'delete',
-        confirmation: ConfirmDialogModel.forDelete('policy', policyCard.id),
+        confirmation: ConfirmDialogModel.forDelete(
+          'policy',
+          policyCard.id,
+          this.translateService,
+        ),
         action: () =>
           this.edcApiService.deletePolicyDefinition(policyCard.id).pipe(
             tap(() => {
diff --git a/src/app/routes/connector-ui/policy-definition-page/policy-definition-page.module.ts b/src/app/routes/connector-ui/policy-definition-page/policy-definition-page.module.ts
index 3d6baaabd..8edb031b3 100644
--- a/src/app/routes/connector-ui/policy-definition-page/policy-definition-page.module.ts
+++ b/src/app/routes/connector-ui/policy-definition-page/policy-definition-page.module.ts
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
@@ -16,6 +22,7 @@ import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
 import {MatSelectModule} from '@angular/material/select';
 import {MatTooltipModule} from '@angular/material/tooltip';
 import {RouterModule} from '@angular/router';
+import {TranslateModule} from '@ngx-translate/core';
 import {JsonDialogModule} from '../../../component-library/json-dialog/json-dialog.module';
 import {PolicyEditorModule} from '../../../component-library/policy-editor/policy-editor.module';
 import {UiElementsModule} from '../../../component-library/ui-elements/ui-elements.module';
@@ -29,6 +36,7 @@ import {PolicyDefinitionPageComponent} from './policy-definition-page/policy-def
     FormsModule,
     ReactiveFormsModule,
     RouterModule,
+    TranslateModule,
 
     // Angular Material
     MatBadgeModule,
diff --git a/src/app/routes/connector-ui/policy-definition-page/policy-definition-page/policy-definition-page.component.html b/src/app/routes/connector-ui/policy-definition-page/policy-definition-page/policy-definition-page.component.html
index 1e34bee36..acf31d2c7 100644
--- a/src/app/routes/connector-ui/policy-definition-page/policy-definition-page/policy-definition-page.component.html
+++ b/src/app/routes/connector-ui/policy-definition-page/policy-definition-page/policy-definition-page.component.html
@@ -1,3 +1,10 @@
+<!--
+  ~ Copyright (c) 2021-2024. sovity GmbH
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
 <div id="wrapper">
   <div class="flex flex-row">
     <!-- Search -->
@@ -5,7 +12,9 @@
       class="search-form-field"
       appearance="outline"
       color="accent">
-      <mat-label>Search policies</mat-label>
+      <mat-label>{{
+        'policy_definition_page.search_pol' | translate
+      }}</mat-label>
       <input matInput [(ngModel)]="searchText" (input)="onSearch()" />
       <mat-icon matPrefix>search</mat-icon>
       <button
@@ -25,7 +34,7 @@
       style="margin-top: 8px; height: 44px"
       routerLink="/policies/create">
       <mat-icon>add_circle_outline</mat-icon>
-      Create policy
+      {{ 'policy_definition_page.create_policy' | translate }}
     </button>
 
     <!-- Spacer -->
@@ -55,7 +64,9 @@
           !policyList.data.policyCards.length)
       "
       class="min-h-[35rem]"
-      [emptyMessage]="'No policy found with given filter.'"></empty-state>
+      [emptyMessage]="
+        'policy_definition_page.no_pol' | translate
+      "></empty-state>
   </div>
   <policy-cards
     *ngIf="policyList.isReady && !!policyList.data.numTotalPolicies"
diff --git a/src/app/routes/connector-ui/transfer-history-page/transfer-history-page.module.ts b/src/app/routes/connector-ui/transfer-history-page/transfer-history-page.module.ts
index 070f0b122..9ae6ea4f7 100644
--- a/src/app/routes/connector-ui/transfer-history-page/transfer-history-page.module.ts
+++ b/src/app/routes/connector-ui/transfer-history-page/transfer-history-page.module.ts
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
@@ -10,6 +16,7 @@ import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
 import {MatTableModule} from '@angular/material/table';
 import {MatTooltipModule} from '@angular/material/tooltip';
 import {RouterModule} from '@angular/router';
+import {TranslateModule} from '@ngx-translate/core';
 import {CatalogModule} from '../../../component-library/catalog/catalog.module';
 import {JsonDialogModule} from '../../../component-library/json-dialog/json-dialog.module';
 import {PipesAndDirectivesModule} from '../../../component-library/pipes-and-directives/pipes-and-directives.module';
@@ -23,6 +30,7 @@ import {TransferHistoryPageComponent} from './transfer-history-page/transfer-his
     FormsModule,
     ReactiveFormsModule,
     RouterModule,
+    TranslateModule,
 
     // Angular Material
     MatButtonModule,
diff --git a/src/app/routes/connector-ui/transfer-history-page/transfer-history-page/transfer-history-page.component.html b/src/app/routes/connector-ui/transfer-history-page/transfer-history-page/transfer-history-page.component.html
index 5ed61777f..6f5453346 100644
--- a/src/app/routes/connector-ui/transfer-history-page/transfer-history-page/transfer-history-page.component.html
+++ b/src/app/routes/connector-ui/transfer-history-page/transfer-history-page/transfer-history-page.component.html
@@ -1,3 +1,10 @@
+<!--
+  ~ Copyright (c) 2021-2024. sovity GmbH
+  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+  ~ Contributors:
+  ~    - Fraunhofer FIT: Internationalization and German Localization
+  -->
+
 <div id="wrapper">
   <div class="flex flex-row">
     <div class="grow"></div>
@@ -24,7 +31,9 @@
         !transferProcessesList.data.transferProcesses.length
       "
       class="min-h-[35rem]"
-      [emptyMessage]="'No transfer history found.'"></empty-state>
+      [emptyMessage]="
+        'tranfer_history_page.no_trans' | translate
+      "></empty-state>
   </div>
   <div
     *ngIf="
@@ -37,7 +46,7 @@
       [dataSource]="transferProcessesList.data.transferProcesses">
       <ng-container matColumnDef="direction">
         <th *matHeaderCellDef class="w-[50px]" mat-header-cell scope="col">
-          Direction
+          {{ 'general.direction' | translate }}
         </th>
         <td *matCellDef="let item" class="w-[50px]" mat-cell>
           <mat-icon class="mat-icon-[28px]">
@@ -47,14 +56,16 @@
       </ng-container>
       <ng-container matColumnDef="lastUpdated">
         <th *matHeaderCellDef class="w-[150px]" mat-header-cell scope="col">
-          Last updated
+          {{ 'general.updated' | translate }}
         </th>
         <td *matCellDef="let item" class="w-[150px]" mat-cell>
           <ago [date]="item.lastUpdatedDate"></ago>
         </td>
       </ng-container>
       <ng-container matColumnDef="assetName">
-        <th *matHeaderCellDef mat-header-cell scope="col">Asset</th>
+        <th *matHeaderCellDef mat-header-cell scope="col">
+          {{ 'general.asset' | translate }}
+        </th>
         <td *matCellDef="let item" mat-cell>
           <div *ngIf="item.direction === 'PROVIDING'">
             <a
@@ -74,7 +85,7 @@
       </ng-container>
       <ng-container matColumnDef="state">
         <th *matHeaderCellDef class="w-[150px]" mat-header-cell scope="col">
-          State
+          {{ 'general.state' | translate }}
         </th>
         <td *matCellDef="let item" class="w-[150px]" mat-cell>
           <div class="flex flex-row items-center space-x-[5px]">
@@ -104,7 +115,7 @@
       </ng-container>
       <ng-container matColumnDef="counterPartyParticipantId">
         <th *matHeaderCellDef mat-header-cell scope="col">
-          Counterparty {{ participantIdLocalization.participantId }}
+          {{ 'transfer_history_page.counter_id' | translate }}
         </th>
         <td *matCellDef="let item" mat-cell>
           {{ item.counterPartyParticipantId }}
@@ -112,7 +123,7 @@
       </ng-container>
       <ng-container matColumnDef="counterPartyConnectorEndpoint">
         <th *matHeaderCellDef mat-header-cell scope="col">
-          Counterparty Connector Endpoint
+          {{ 'transfer_history_page.counter_endpoint' | translate }}
         </th>
         <td *matCellDef="let item" mat-cell>
           {{ item.counterPartyConnectorEndpoint }}
@@ -120,14 +131,14 @@
       </ng-container>
       <ng-container matColumnDef="details">
         <th *matHeaderCellDef class="w-[100px]" mat-header-cell scope="col">
-          Details
+          {{ 'general.detail' | translate }}
         </th>
         <td *matCellDef="let item" class="w-[100px]" mat-cell>
           <a
             class="link"
             href="javascript:void(0)"
             (click)="onTransferHistoryDetailsClick(item)">
-            {{ 'Show Details' }}
+            {{ 'general.details' | translate }}
           </a>
         </td>
       </ng-container>
diff --git a/src/app/routes/connector-ui/transfer-history-page/transfer-history-page/transfer-history-page.component.ts b/src/app/routes/connector-ui/transfer-history-page/transfer-history-page/transfer-history-page.component.ts
index abc70ba92..eae19698a 100644
--- a/src/app/routes/connector-ui/transfer-history-page/transfer-history-page/transfer-history-page.component.ts
+++ b/src/app/routes/connector-ui/transfer-history-page/transfer-history-page/transfer-history-page.component.ts
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2021-2024. sovity GmbH
+ * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
+ * Contributors:
+ *    - Fraunhofer FIT: Internationalization and German Localization
+ */
 import {Component, OnDestroy, OnInit} from '@angular/core';
 import {
   EMPTY,
@@ -9,6 +15,7 @@ import {
   switchMap,
 } from 'rxjs';
 import {catchError, map} from 'rxjs/operators';
+import {TranslateService} from '@ngx-translate/core';
 import {
   TransferHistoryEntry,
   TransferHistoryPage,
@@ -51,13 +58,16 @@ export class TransferHistoryPageComponent implements OnInit, OnDestroy {
     private notificationService: NotificationService,
     private jsonDialogService: JsonDialogService,
     public participantIdLocalization: ParticipantIdLocalization,
+    private translateService: TranslateService,
   ) {}
 
   onTransferHistoryDetailsClick(item: TransferHistoryEntry) {
     this.jsonDialogService.showJsonDetailDialog(
       {
         title: item.assetName ?? item.assetId,
-        subtitle: 'Transfer History Details',
+        subtitle: this.translateService.instant(
+          'transfer_history_page.subtitle',
+        ),
         icon: 'assignment',
         objectForJson: item,
       },
@@ -79,8 +89,9 @@ export class TransferHistoryPageComponent implements OnInit, OnDestroy {
         this.assetDetailDialogService.open(data, this.ngOnDestroy$);
       },
       error: (error) => {
-        console.error('Failed to fetch asset details!', error);
-        this.notificationService.showError('Failed to fetch asset details!');
+        const fai_fet = this.translateService.instant('notification.fai_fet');
+        console.error(fai_fet, error);
+        this.notificationService.showError(fai_fet);
       },
     });
   }
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
new file mode 100644
index 000000000..0b22ffb34
--- /dev/null
+++ b/src/assets/i18n/de.json
@@ -0,0 +1,294 @@
+{
+  "general": {
+    "close": "Schließen",
+    "delete": "Löschen",
+    "error": "Fehler",
+    "confirm": "Bestätigen",
+    "edit": "Bearbeiten",
+    "remove": "Entfernen",
+    "add": "Hinzufügen",
+    "cancel": "Abbrechen",
+    "create": "Erstellen",
+    "update": "Aktualisieren",
+    "refresh": "Aktualisieren",
+    "total": "Total",
+    "details": "Zeige Details",
+    "detail": "Details",
+    "warn": "Warnung",
+    "title": "Titel",
+    "disable": "Deaktivieren",
+    "enable": "Aktivieren",
+    "show": "Zeige",
+    "hide": "Verberge",
+    "description": "Beschreibung",
+    "loading": "Lädt...",
+    "loading1": "Lädt",
+    "loading2": "Lädt noch...",
+    "language": "Sprache",
+    "value": "Wert",
+    "method": "Methode",
+    "method_para": "Parametrisierung der Methode",
+    "path": "Pfad",
+    "params": "Abfrageparameter",
+    "add_properties": "Weitere Eigenschaften",
+    "category": "Datenkategorie",
+    "subcategory": "Datenunterkategorie",
+    "model": "Datenmodell",
+    "transport": "Transportmodus",
+    "geo_method": "Georeferenz-Methode",
+    "geo_location": "Geo-Standort",
+    "sovereign": "Souverän",
+    "frequency": "Häufigkeit der Datenaktualisierung",
+    "nuts": "NUTS-Standort",
+    "data": "Datenbeispiel",
+    "show_data": "Zeige Datenbeispiel",
+    "files": "Referenzdateien",
+    "show_files": "Zeige Referenzdateien",
+    "coverage": "Zeitlicher Geltungsbereich",
+    "conditions": "Nutzungsbedingungen",
+    "pol": "Richtlinie",
+    "policies": "Richtlinien",
+    "irr_pol": "Irreguläre Richtlinie",
+    "policy": "Vertragsrichtlinien",
+    "offer": "Vertragsangebot",
+    "con_def": "Vertragsdefinition",
+    "cons": "Einschränkungen",
+    "body": "Körper",
+    "type": "Typ",
+    "state": "Status",
+    "updated": "Zuletzt aktualisiert",
+    "direction": "Richtung",
+    "contract": "Vertragsabschluss",
+    "access_pol": "Zugriffsrichtlinie",
+    "assets": "Datenbestände",
+    "asset": "Datenbestand",
+    "consuming": "Eingehend",
+    "providing": "Ausgehend",
+    "endpoint": "Konnektor Endpunkt",
+    "endpoint_doc": "Endpunkt Dokumentation",
+    "content": "Inhaltstyp",
+    "publisher": "Anbieter",
+    "st_license": "Standardlizenz",
+    "ad_info": "Weitere Informationen",
+    "id": "Vertragsangebot ID",
+    "oth_connector": "Gegenseite",
+    "signed": "Abgeschlossen",
+    "auth": "Authentifizierung",
+    "add_auth": "Authentifizierung hinzufügen",
+    "header_sec": "Kopfzeile mit Vault Passwort",
+    "header_val": "Kopfzeile mit Wert",
+    "auth_header": "Authentifizierungskopfzeile Name",
+    "auth_value": "Authentifizierungskopfzeile Wert",
+    "vault_secret": "Vault-Passwort-Name",
+    "rem_auth": "Entferne Authentifizierung",
+    "add_header": "Zusätzliche Kopfzeilen",
+    "header_name": "Kopfzeilen-Name",
+    "header_value": "Kopfzeilen-Wert",
+    "add_add_header": "Füge zusätzliche Kopfzeile hinzu"
+  },
+  "tooltip": {
+    "negotiate": "Sie können keine Verträge mit Ihrem eigenen Konnektor aushandeln.",
+    "details": "Klicken Sie hier für Details",
+    "failed_details": "Klicken Sie hier für fehlgeschlagene Katalogdetails",
+    "clipboard": "In die Zwischenablage kopieren"
+  },
+  "notification": {
+    "starting_neg": "Scheitern bei der Aufnahme von Verhandlungen.",
+    "negotiation": "Gescheiterte Vertragsverhandlungen.",
+    "compl_negotiation": "Vertragsverhandlungen abgeschlossen!",
+    "asset": "Datei erfolgreich gespeichert.",
+    "failed_asset": "Fehlgeschlagene Speichervorgang!",
+    "failed_refresh": "Aktualisierung der Datenbestände fehlgeschlagen!",
+    "succ_pol": "Erfolgreich erstellte Richtlinie.",
+    "fai_pol": "Fehlgeschlagene Richtlinie",
+    "fai_fet": "Datei-Details konnten nicht abgerufen werden!"
+  },
+  "component_library": {
+    "delete_title": "Bestätigung der Löschung",
+    "delete_one": "Bitte bestätigen Sie, dass Sie löschen möchten",
+    "delete_two": ". Diese Aktion kann nicht rückgängig gemacht werden.",
+    "t_history": "Übertragungshistorie",
+    "negotiate": "Verhandeln",
+    "negotiating": "Verhandeln...",
+    "succ_negotiating": "Erfolgreich verhandelt",
+    "transfer": "Übertragung",
+    "no_description": "Keine Beschreibung",
+    "show_more": "Zeige mehr",
+    "show_less": "Zeige weniger",
+    "organization": "Organisation",
+    "http_param": "HTTP-Datenquellen-Parametrisierung",
+    "policy_details": "Zeige Richtlinien Details",
+    "content": "Inhaltstyp",
+    "at": "Erstellt am",
+    "up_at": "Aktualisiert am",
+    "oth_connector": "Gegenpart",
+    "participant_id": "Teilnehmer ID",
+    "connector_id": "Konnector ID",
+    "json_ld": "Zeige JSON-LD",
+    "no_transfer": "Kein Übertragungsprozess bisher gestartet.",
+    "json": "Bereinigtes JSON",
+    "agree": "Ich stimme den Allgemeinen Geschäftsbedingungen zu.",
+    "accept_licence": "Hiermit erkläre ich mich damit einverstanden, dass ich durch Drücken der Schaltfläche \"Bestätigen\" die mit dem Angebot des Anbieters verbundenen Lizenzbedingungen, Richtlinien und zusätzlichen Nutzungsbedingungen, einschließlich aller Urheberrechtshinweise, akzeptiere.",
+    "data_offer": "Allgemeine Geschäftsbedingungen für das Datenangebot"
+  },
+  "services": {
+    "env_version": "Umgebungs Version",
+    "failed_loading": "Fehler beim Laden von Verbindungsinformationen",
+    "curator_url": "Kurator-URL",
+    "curator_org": "Name der Kurator Organisation",
+    "maintainer": "Name der betreuenden Organisation",
+    "main_url": "URL betreuende Organisation"
+  },
+  "asset_page": {
+    "information": "Generelle Informationen",
+    "asset_id": "Datenbestand-ID",
+    "keywords": "Passwort",
+    "legal_name": "Rechtlicher Name des Dateninhabers",
+    "add_file": "Referenzdatei hinzufügen",
+    "file_des": "Beschreibung der Referenzdateien",
+    "info_file": "Zusätzliche Informationen zu den Referenzdateien",
+    "instructions": "Zusätzliche, rechtlich nicht relevante Nutzungshinweise (z. B. wie der Datensatz zu zitieren ist)",
+    "datasource_info": "Datenquellen Information",
+    "datasource": "Datenquelle",
+    "datasource_config": "Benutzerdefinierte Datenquellenkonfiguration (JSON)",
+    "provide": "Die konsumierende Seite muss eine benutzerdefinierte HTTP-Methode mit aktivierter Methodenparametrisierung bereitstellen.",
+    "http_subpath": "Die konsumierende Seite muss einen benutzerdefinierten HTTP-Unterpfad bereitstellen, bei dem die Methodenparametrisierung aktiviert ist. Der benutzerdefinierte HTTP-Teilpfad wird an den Basispfad angehängt.",
+    "path_para": "Pfadparametrisierung",
+    "query_para": "Abfrageparameter",
+    "query_name": "Abfrage Parametername",
+    "default_query": "Wenn die Parametrisierung von Abfrageparametern aktiviert ist, werden die Standardabfrageparameter und die vom Verbraucher bereitgestellten Abfrageparameter zusammengeführt.",
+    "query_parameter": " Parametrisierung von Abfrageparametern",
+    "info_body": "Der Anfragekörper kann nur von der Verbraucherseite aus festgelegt werden, wenn die Parametrisierung aktiviert ist.",
+    "request_body": "Anfragekörper",
+    "request_para": "Parametrisierung des Anfragekörpers",
+    "search_assets": "Durchsuche Datenbestände",
+    "create_assets": "Erstelle Datenbestände",
+    "create_asset": " Erstelle neuen Datenbestand",
+    "edit_asset": "Bearbeite Datenbestand",
+    "no_assets": "Keine Datenbestände mit gegebenem Filter gefunden.",
+    "descrip": "Die Beschreibung nutzt",
+    "add_loc": "Füge Ort hinzu",
+    "add_sample": "Füge Beispieldaten hinzu"
+  },
+  "catalog_browser_page": {
+    "fetch": "Status abrufen",
+    "endpoint_catalogs": "Andere Kataloge für Verbindungs-Endpunkte",
+    "search": "Katalogssuche",
+    "con_endpoints": "Konnektor Endpunkte",
+    "enter_endpoints": "Bitte geben Sie andere Connector-Endpunkte an, um Kataloge zu holen.",
+    "no_contract_offers": "Keine Vertragsangebote mit diesem Filter gefunden",
+    "contract": "Vertragsangebot",
+    "usage": "Bereits verwendet"
+  },
+  "contract_agreement_page": {
+    "search_agree": "Suche nach Vertragsvereinbarungen...",
+    "no_agree": "Noch keine vertraglichen Vereinbarungen.",
+    "no_agree_found": "Keine Vertragsvereinbarungen mit gegebenem Filter gefunden.",
+    "con_agree": "Verbrauchen von Vertragsvereinbarungen",
+    "prov_agree": "Bereitstellung von Vertragsvereinbarungen",
+    "ini_transfer": "Übertragung einleiten",
+    "http_fields": "Http-Datenquellenparametrisierung Felder",
+    "http_para": "Http-Datenquellen-Parametrisierung",
+    "http_message": "Wenn das Datenangebot auf der Anbieterseite vom Typ HttpData ist und bestimmte Datenquellenfelder gesetzt sind, können bestimmte Teile der Anfrage an die Datenquelle von der Verbraucherseite aus angepasst werden und werden bei der Einleitung der Übertragung an den anderen Konnektor übergeben. Dadurch kann ein Asset mehr als nur eine Art von Daten enthalten, was zusätzliche Filterung oder sogar die gemeinsame Nutzung ganzer APIs mit mehreren Datensätzen über ein einziges Asset und einen einzigen Vertrag ermöglicht.",
+    "res_url": "Die resultierende URL sieht wie folgt aus",
+    "proxy_body": "Erfordert, dass Anfragekörper wahr ist.",
+    "proxy_query": "Erfordert, dass Anfrageparameter wahr sind.",
+    "proxy_path": "Erfordert, dass Anfragepfad wahr ist.",
+    "proxy_method": "Erfordert, dass Anfragemethode wahr ist. ",
+    "datasink": "Datasenke",
+    "cus_datasink": "Benutzerdefinierte Datasenke-Konfiguration (JSON)",
+    "cus_transfer": "Benutzerdefinierte Übertragungsprozess-Anforderung (JSON)",
+    "json_hint": "JSON-LD Werte für edc:connectorId, edc:contractId, edc:connectorId und edc:connectorAddress werden überschrieben.",
+    "cus_meth": "Benutzerdefinierte Methode",
+    "cus_query": "Benutzerdefinierte Abfrage Parameter Name",
+    "add_cus_query": "Benutzerdefinierten Abfrage-Parameter hinzufügen",
+    "req_cont": "Benutzerdefinierter Inhaltstyp für Anfragen",
+    "req_body": "Anfragekörper",
+    "cus_sub": "Benutzerdefinierter Unterpfad",
+    "new_def": "Erstelle neue Vertragsdefinition",
+    "search_def": "Suche Vertragsdefinition",
+    "create_def": "Vertragsdefinition erstellen",
+    "con_def": "Keine Vertragsdefinition mit gegebenem Filter gefunden."
+  },
+  "dashboard_page": {
+    "error": "Fehler",
+    "completed": "Abgeschlossen",
+    "progress": "In Arbeit",
+    "no_transfer": "Keine ausgehenden Übertragungen",
+    "no_transfer2": "Keine eingehenden Übertragungen",
+    "num_transfer": "Anzahl der Übertragungsvorgänge",
+    "failed_ui_build": "Abruf der Daten des letzten Baudatums der Benutzeroberfläche fehlgeschlagen",
+    "failed_ui": "Abruf der letzten UI Commit Daten fehlgeschlagen",
+    "failed_env": "Abruf von Env und Jar letzten Commit Daten fehlgeschlagen",
+    "failed_dashboard": "Abruf von Dashboard-Seitendaten fehlgeschlagen",
+    "failed_offers": "DATENÜBERTRAGUNG FEHLGESCHLAGEN",
+    "inc_data": "Eingehende Daten",
+    "trans_pro": "Übertragungsvorgänge",
+    "out_data": "Ausgehende Daten",
+    "conn_prop": "Konnektor Eigenschaften",
+    "add_prop": "Zusätzliche Eigenschaften",
+    "edc_conn": "EDC Konnektor",
+    "descrip": "Geben Sie den folgenden Konnektor-Endpunkt frei, um anderen den Zugriff auf den Katalog Ihres EDC Konnektors zu ermöglichen. Dies ist vor allem bei der Verwendung von Datenangeboten mit eingeschränktem Konnektor nützlich, die in Brokern nicht angezeigt werden.",
+    "conn_end": "Konnektor Endpunkte",
+    "api_url": "Management API URL",
+    "edition_edc": "Basisausgabe EDC",
+    "page": "klicken.",
+    "descrip2": "Dieser EDC Konnektor auf der Abo-Ebene Basic wird von sovity bereitgestellt, um Ihre ersten Schritte im Mobility Data Space (MDS) zu ermöglichen.",
+    "descrip3": "Für zusätzliche Funktionen und erweiterte Kapazitäten können Sie uns gerne kontaktieren.",
+    "descrip4": "Um Datenräume wie Mobility Data Space oder Catena-X innerhalb weniger Minuten zu verbinden, betrachten Sie die verwaltete Lösung von",
+    "descrip5": "- den Connector-as-a-Service (CaaS), der auf Open-Source-Software basiert und mit wichtigen Unternehmensfunktionen angereichert ist.",
+    "descrip6": "Das Eclipse Dataspace Components Framework ermöglicht einen souveränen, organisationsübergreifenden Datenaustausch.",
+    "descrip7": "Es implementiert den internationalen Datenraumstandard (IDS) sowie die mit GAIA-X verbundenen relevanten Protokolle.",
+    "descrip8": "Der Aufbau ist so erweiterbar wie möglich gestaltet, um die Integration in verschiedene Datenökosysteme zu fördern.",
+    "descrip9": "Beispielhafte Anwendungsfälle, die Sie mit dieser Anwendung ausprobieren können, sind:",
+    "descrip10": "Zeigen Sie den Datenbestands-Katalog an, der Ihnen in Ihrem Datenraum zur Verfügung steht, unter",
+    "descrip11": "Verhandeln Sie einen Vertrag für die gemeinsame Nutzung von Daten in Ihrem Datenraum unter",
+    "descrip12": "Übertragen Sie ein Element in Ihren Datenraum indem Sie auf ",
+    "descrip13": "Sehen Sie sich an, welche Datenbestände in Ihrem Datenraum übertragen wurden, indem Sie auf",
+    "descrip14": "Betrachten und erstellen Sie Datenbstände indem Sie auf",
+    "descrip15": "Betrachten und erstellen Sie Richtlinien und wenden Sie diese auf Datenbestände in Ihrem Datenraum an, indem Sie auf",
+    "descrip16": "Veröffentlichen Sie ein neues Element in Ihrem Datenraum unter",
+    "descrip17": "Betrachten Sie ihre existierenden Verträge, indem Sie auf",
+    "contact": "Kontaktieren Sie uns",
+    "managed_edc": "Managed  EDC",
+    "conn_service": "Konnektor als Dienstleistung",
+    "about": "Über EDC",
+    "eclipse": "Eclipse-Datenraum-Komponenten",
+    "about_ui": "Über EDC UI",
+    "data_dashboard": "Daten Dashboard",
+    "catalog": "Datenkatalog",
+    "contracts": "Verträge",
+    "transfer": "Übertragungshistorie",
+    "con_def": "Vertragsefinitions",
+    "your_def": "Deine Vertragsdefinitionen",
+    "your_assets": "Deine Datenbestände",
+    "your_pol": "Deine Richtlinien",
+    "pre_cat": "Vorkonfigurierte Kataloge",
+    "con_agree": "Vertragliche Vereinbarungen"
+  },
+  "policy_definition_page": {
+    "create_pol": "Erstelle eine neue Richtlinie",
+    "time_res": "Zeitlich begrenzter Zeitraum",
+    "conn_res": "Anschluss mit vom Konnektor eingeschränkter Nutzung",
+    "date_range": "Datumsbereich",
+    "search_pol": "Durchsuche Richtlinien",
+    "create_policy": "Erstelle eine Richtlinie",
+    "no_pol": "Keine Richtlinie mit gegebenem Filter gefunden."
+  },
+  "transfer_history_page": {
+    "subtitle": "Übertragungshistorie Details",
+    "no_trans": "Keine Übertragungshistorie gefunden.",
+    "counter_endpoint": "Gegenpart Konnektorendpunkt",
+    "counter_id": "Gegenpart Teilnehmer ID"
+  },
+  "connector_ui": {
+    "dashboard": "Übersicht",
+    "catalog": "Katalogssuche",
+    "contracts": "Verträge",
+    "transfer": "Übertragungshistorie",
+    "assets": "Datenbestände",
+    "policies": "Richtlinien",
+    "contract": "Vertragsdefinition",
+    "logout": "Ausloggen"
+  }
+}
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
new file mode 100644
index 000000000..d8a8e6d42
--- /dev/null
+++ b/src/assets/i18n/en.json
@@ -0,0 +1,294 @@
+{
+  "general": {
+    "close": "Close",
+    "delete": "Delete",
+    "error": "Error",
+    "confirm": "Confirm",
+    "edit": "Edit",
+    "remove": "Remove",
+    "add": "Add",
+    "cancel": "Cancel",
+    "create": "Create",
+    "update": "Update",
+    "refresh": "Refresh",
+    "total": "Total",
+    "details": "Show Details",
+    "detail": "Details",
+    "warn": "Warn",
+    "title": "Title",
+    "disable": "Disable",
+    "enable": "Enable",
+    "show": "Show",
+    "hide": "Hide",
+    "description": "Description",
+    "loading": "Loading...",
+    "loading1": "Loading",
+    "loading2": " Still Loading...",
+    "language": "Language",
+    "value": "Value",
+    "method": "Method",
+    "method_para": "Method Parameterization",
+    "path": "Path",
+    "params": "Query Params",
+    "add_properties": "Additional Properties",
+    "category": "Data Category",
+    "subcategory": "Data Subcategory",
+    "model": "Data Model",
+    "transport": "Transport Mode",
+    "geo_method": "Geo reference method",
+    "geo_location": "Geo Location",
+    "sovereign": "Sovereign",
+    "frequency": "Data Update Frequency",
+    "nuts": "NUTS Locations",
+    "data": "Data Samples",
+    "show_data": "Show Data Samples",
+    "files": "Reference Files",
+    "show_files": "Show Reference Files",
+    "coverage": "Temporal Coverage",
+    "conditions": "Conditions For Use",
+    "pol": "Policy",
+    "policies": "Policies",
+    "irr_pol": "Irregular Policy",
+    "policy": "Contract Policy",
+    "offer": "Contract Offer",
+    "con_def": "Contract Definition",
+    "cons": "Constraints",
+    "body": "Body",
+    "type": "Type",
+    "state": "State",
+    "updated": "Last updated",
+    "direction": "Direction",
+    "contract": "Contract Agreement",
+    "access_pol": "Access Policy",
+    "assets": "Assets",
+    "asset": "Asset",
+    "consuming": "Consuming",
+    "providing": "Providing",
+    "endpoint": "Connector Endpoint",
+    "endpoint_doc": "Endpoint Documentation",
+    "content": "Content Type",
+    "publisher": "Publisher",
+    "st_license": "Standard License",
+    "ad_info": "Advanced Information",
+    "id": "Contract Offer ID",
+    "oth_connector": "Other Connector",
+    "signed": "Signed",
+    "auth": "Authentication",
+    "add_auth": "Add Authentication",
+    "header_sec": "Header with Vault Secret",
+    "header_val": "Header with Value",
+    "auth_header": "Auth Header Name",
+    "auth_value": "Auth Header Value",
+    "vault_secret": "Vault Secret Name",
+    "rem_auth": "Remove Authentication",
+    "add_header": "Additional Headers",
+    "header_name": "Header Name",
+    "header_value": "Header Value",
+    "add_add_header": "Add Additional Header"
+  },
+  "tooltip": {
+    "negotiate": "Cannot negotiate contracts with your own connector.",
+    "details": "Click for details",
+    "failed_details": "Click for failed catalog details",
+    "clipboard": "Copy to clipboard"
+  },
+  "notification": {
+    "starting_neg": "Failure starting negotiation.",
+    "negotiation": "Failed negotiating contract.",
+    "compl_negotiation": "Contract Negotiation complete!",
+    "asset": "Successfully saved asset.",
+    "failed_asset": "Failed saving asset!",
+    "failed_refresh": "Failed refreshing asset list!",
+    "succ_pol": "Successfully created policy.",
+    "fai_pol": "Failed creating Policy!",
+    "fai_fet": "Failed to fetch asset details!"
+  },
+  "component_library": {
+    "delete_title": "Deletion confirmation",
+    "delete_one": "Please confirm you want to delete",
+    "delete_two": ". This action cannot be undone.",
+    "t_history": "Transfer History",
+    "negotiate": "Negotiate",
+    "negotiating": "Negotiating...",
+    "succ_negotiating": "Successfully Negotiated",
+    "transfer": "Transfer",
+    "no_description": "No Description",
+    "show_more": "Show more",
+    "show_less": "Show less",
+    "organization": "Organization",
+    "http_param": "HTTP Data Source Parameterization",
+    "policy_details": "Show Policy Details",
+    "content": "Content Type",
+    "at": "Created At",
+    "up_at": "Updated At",
+    "oth_connector": "Other Connector",
+    "participant_id": "Participant ID",
+    "connector_id": "Connector ID",
+    "json_ld": "Show JSON-LD",
+    "no_transfer": "No transfer processes started yet.",
+    "json": "Cleaned JSON",
+    "agree": "I agree to the Data Offer Terms & Conditions",
+    "accept_licence": "Hereby I agree that by pressing the 'Confirm' button, I accept the license\n    terms, policies, and additional conditions for use, including any copyright\n    notices, associated with the provider's offer.",
+    "data_offer": "Data Offer Terms & Conditions"
+  },
+  "services": {
+    "env_version": "Environment Version",
+    "failed_loading": "Failed loading connector information",
+    "curator_url": "Curator URL",
+    "curator_org": "Curator Organization Name",
+    "maintainer": "Maintainer Organization Name",
+    "main_url": "Maintainer URL"
+  },
+  "asset_page": {
+    "information": "General Information",
+    "asset_id": "Asset ID",
+    "keywords": "Keywords",
+    "legal_name": "Legal name of the data owner",
+    "add_file": "Add reference file",
+    "file_des": "Reference files description",
+    "info_file": "Additional information regarding the reference files",
+    "instructions": "Additional not legally relevant usage instructions (e.g. how to cite the dataset)",
+    "datasource_info": "Datasource Information",
+    "datasource": "Datasource",
+    "datasource_config": "Custom Datasource Config (JSON)",
+    "provide": "The consuming side must provide a Custom HTTP Method with method parameterization enabled.",
+    "http_subpath": "The consuming side must provide a Custom HTTP Subpath with method parameterization is enabled. The Custom HTTP Subpath will be appended to the base path.",
+    "path_para": "Path Parameterization",
+    "query_para": "Query Params",
+    "query_name": "Query Param Name",
+    "default_query": "With query param parameterization enabled, the default query params and the query params provided by the consumer will be merged.",
+    "query_parameter": " Query Param Parameterization",
+    "info_body": "The request body can only be set from the consumer side, if parameterization is enabled.",
+    "request_body": "Request Body",
+    "request_para": "Request Body Parameterization",
+    "search_assets": "Search assets",
+    "create_assets": "Create assets",
+    "create_asset": " Create New Asset",
+    "edit_asset": "Edit Asset",
+    "no_assets": "No assets found with given filter.",
+    "descrip": "The description uses",
+    "add_loc": "Add location",
+    "add_sample": "Add data sample"
+  },
+  "catalog_browser_page": {
+    "fetch": "Fetch Status",
+    "endpoint_catalogs": "Other Connector Endpoint Catalogs",
+    "search": "Search catalog",
+    "con_endpoints": "Connector Endpoints",
+    "enter_endpoints": "Please enter other connector endpoints to fetch catalogs.",
+    "no_contract_offers": "No contract offers found with this filter",
+    "contract": "Contract Offer",
+    "usage": "Already using"
+  },
+  "contract_agreement_page": {
+    "search_agree": "Search contract agreements...",
+    "no_agree": "No contract agreements yet.",
+    "no_agree_found": "No contract agreements found with given filter.",
+    "con_agree": "Consuming Contract Agreements",
+    "prov_agree": "Providing Contract Agreements",
+    "ini_transfer": "Initiate Transfer",
+    "http_fields": "Http Datasource Parameterization Fields",
+    "http_para": "Http Datasource Parameterization",
+    "http_message": "When the data offer on the provider side is of the type HttpData and certain data source fields are set, certain parts of the request to the data source can be customized from the consumer side and will be passed to the other connector when initiating the transfer. This allows an asset to contain more than just one kind of data, allowing additional filtering or even sharing of entire APIs with multiple data sets via a single asset and a single contract.",
+    "res_url": "The resulting URL will look like",
+    "proxy_body": "Requires proxyBody to be true.",
+    "proxy_query": "Requires proxyQueryParams to be true",
+    "proxy_path": "Requires proxyPath to be true. ",
+    "proxy_method": "Requires proxyMethod to be true. ",
+    "datasink": "Datasink",
+    "cus_datasink": "Custom Datasink Config (JSON)",
+    "cus_transfer": "Custom Transfer Process Request (JSON)",
+    "json_hint": "JSON-LD values for edc:connectorId, edc:contractId, edc:connectorId and edc:connectorAddress will be overridden.",
+    "cus_meth": "Custom Method",
+    "cus_query": "Custom Query Param Name",
+    "add_cus_query": "Add Custom Query Param",
+    "req_cont": "Custom Request Body Content Type",
+    "req_body": "Custom Request Body",
+    "cus_sub": "Custom Subpath",
+    "new_def": "Create New Contract Definition",
+    "search_def": "Search contract definitions",
+    "create_def": "Create Contract Definition",
+    "con_def": "No contract definition found with given filter."
+  },
+  "dashboard_page": {
+    "error": "Error",
+    "completed": "Completed",
+    "progress": "In Progress",
+    "no_transfer": "NO PROVIDING TRANSFER PROCESSES",
+    "no_transfer2": "NO CONSUMING TRANSFER PROCESSES",
+    "num_transfer": "Number of Transfer Processes",
+    "failed_ui_build": "Failed fetching UI Last Build Date Data",
+    "failed_ui": "Failed fetching UI Last Commit Data",
+    "failed_env": "Failed fetching Env and Jar Last Commit Data",
+    "failed_dashboard": "Failed fetching Dashboard Page Data",
+    "failed_offers": "Failed fetching data offers.",
+    "inc_data": "Incoming Data",
+    "trans_pro": "Transfer Processes",
+    "out_data": "Outgoing Data",
+    "conn_prop": "Connector Properties",
+    "add_prop": "Additional Properties",
+    "edc_conn": "EDC Connector",
+    "descrip": "Share the following Connector Endpoint to let others access your EDC Connector's catalog. This is especially useful when using connector-restricted data offers which won't show up in brokers.",
+    "conn_end": "Connector Endpoint",
+    "api_url": "Management API URL",
+    "edition_edc": "Basic Edition EDC",
+    "page": "Page",
+    "descrip2": "This EDC Connector on the subscription level Basic is provided by sovity to enable your first steps in the Mobility Data Space (MDS).",
+    "descrip3": "For additional features and advanced capacities, please feel free to contact us.",
+    "descrip4": "To join data spaces like Mobility Data Space or Catena-X within minutes, consider the managed solution by",
+    "descrip5": "- the Connector-as-a-Service (CaaS) based on open-source software enriched with key enterprise features.",
+    "descrip6": "The Eclipse Dataspace Components framework facilitates sovereign, inter-organizational data exchange.",
+    "descrip7": "It implements the International Data Spaces standard (IDS) as well as relevant protocols associated with GAIA-X.",
+    "descrip8": "The framework is designed as extensible as possible to encourage integrations into various data ecosystems.",
+    "descrip9": "Example use cases, that you can try out with this application, are:",
+    "descrip10": "View the asset catalog available to you in your Dataspace using the",
+    "descrip11": "Negotiate a contract for data sharing in your Dataspace using the",
+    "descrip12": "Transfer an asset in your Dataspace using the",
+    "descrip13": "View which assets have been transferred in your Dataspace in the",
+    "descrip14": "View and create assets using the",
+    "descrip15": "View and create policies and apply these to assets in your Dataspace using the",
+    "descrip16": "Publish a new asset into your Dataspace using the",
+    "descrip17": "View your existing contracts in the",
+    "contact": "Contact us",
+    "managed_edc": "Get Managed EDC",
+    "conn_service": "Connector-as-a-Service",
+    "about": "About EDC",
+    "eclipse": "Eclipse Dataspace Components",
+    "about_ui": "About EDC UI",
+    "data_dashboard": "Data Dashboard",
+    "catalog": "Catalog Browser",
+    "contracts": "Contracts",
+    "transfer": "Transfer History",
+    "con_def": "Contract Definitions",
+    "your_def": "Your Contract Definitions",
+    "your_assets": "Your Assets",
+    "your_pol": "Your Policies",
+    "pre_cat": "Preconfigured Catalogs",
+    "con_agree": "Contract Agreements"
+  },
+  "policy_definition_page": {
+    "create_pol": "Create New Policy",
+    "time_res": "Time-Period-Restricted",
+    "conn_res": "Connector-Restricted-Usage",
+    "date_range": "Date Range",
+    "search_pol": "Search policies",
+    "create_policy": "Create Policy",
+    "no_pol": "No policy found with given filter."
+  },
+  "transfer_history_page": {
+    "subtitle": "Transfer History Details",
+    "no_trans": "No transfer history found.",
+    "counter_endpoint": "Counterparty Connector Endpoint",
+    "counter_id": "Counterparty Participant ID"
+  },
+  "connector_ui": {
+    "dashboard": "Dashboard",
+    "catalog": "Catalog Browser",
+    "contracts": "Contracts",
+    "transfer": "Transfer History",
+    "assets": "Assets",
+    "policies": "Policies",
+    "contract": "Contract Definitions",
+    "logout": "Logout"
+  }
+}
diff --git a/src/assets/images/flags/de.svg b/src/assets/images/flags/de.svg
new file mode 100644
index 000000000..442047028
--- /dev/null
+++ b/src/assets/images/flags/de.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+	"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="600" viewBox="0 0 5 3">
+	<desc>Flag of Germany</desc>
+	<rect id="black_stripe" width="5" height="3" y="0" x="0" fill="#000"/>
+	<rect id="red_stripe" width="5" height="2" y="1" x="0" fill="#D00"/>
+	<rect id="gold_stripe" width="5" height="1" y="2" x="0" fill="#FFCE00"/>
+</svg>
diff --git a/src/assets/images/flags/en.svg b/src/assets/images/flags/en.svg
new file mode 100644
index 000000000..56487b083
--- /dev/null
+++ b/src/assets/images/flags/en.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 30" width="1200" height="600">
+<clipPath id="s">
+	<path d="M0,0 v30 h60 v-30 z"/>
+</clipPath>
+<clipPath id="t">
+	<path d="M30,15 h30 v15 z v15 h-30 z h-30 v-15 z v-15 h30 z"/>
+</clipPath>
+<g clip-path="url(#s)">
+	<path d="M0,0 v30 h60 v-30 z" fill="#012169"/>
+	<path d="M0,0 L60,30 M60,0 L0,30" stroke="#fff" stroke-width="6"/>
+	<path d="M0,0 L60,30 M60,0 L0,30" clip-path="url(#t)" stroke="#C8102E" stroke-width="4"/>
+	<path d="M30,0 v30 M0,15 h60" stroke="#fff" stroke-width="10"/>
+	<path d="M30,0 v30 M0,15 h60" stroke="#C8102E" stroke-width="6"/>
+</g>
+</svg>

From 66426e1e56b88670278a2dc16397d6b2ab59e104 Mon Sep 17 00:00:00 2001
From: Andreas Timmermann <andreas.timmermann@fit.fraunhofer.de>
Date: Thu, 5 Sep 2024 17:05:51 +0200
Subject: [PATCH 2/5] adapt translations after rebase

---
 .../edit-asset-form/edit-asset-form.module.ts |   3 +
 .../edit-asset-form.component.html            | 127 +++++++++---------
 .../keyword-select.component.html             |   4 +-
 .../language-select.component.html            |   2 +-
 .../policy-operator-select.component.ts       |   6 +-
 .../asset-edit-dialog.component.html          | 105 +++++++--------
 .../keyword-select.component.html             |   4 +-
 .../policy-definition-create-page.module.ts   |   2 +
 ...licy-definition-create-page.component.html |   8 +-
 src/assets/i18n/de.json                       |  42 +++++-
 src/assets/i18n/en.json                       |  36 ++++-
 11 files changed, 199 insertions(+), 140 deletions(-)

diff --git a/src/app/component-library/edit-asset-form/edit-asset-form.module.ts b/src/app/component-library/edit-asset-form/edit-asset-form.module.ts
index 47d79dac2..636a0f879 100644
--- a/src/app/component-library/edit-asset-form/edit-asset-form.module.ts
+++ b/src/app/component-library/edit-asset-form/edit-asset-form.module.ts
@@ -37,6 +37,8 @@ import {EditAssetFormComponent} from './edit-asset-form/edit-asset-form.componen
 import {KeywordSelectComponent} from './keyword-select/keyword-select.component';
 import {LanguageSelectComponent} from './language-select/language-select.component';
 import {TransportModeSelectComponent} from './transport-mode-select/transport-mode-select.component';
+import {TranslateModule} from '@ngx-translate/core';
+
 
 @NgModule({
   imports: [
@@ -45,6 +47,7 @@ import {TransportModeSelectComponent} from './transport-mode-select/transport-mo
     FormsModule,
     ReactiveFormsModule,
     RouterModule,
+	TranslateModule,
 
     // Angular Material
     MatBadgeModule,
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/edit-asset-form.component.html b/src/app/component-library/edit-asset-form/edit-asset-form/edit-asset-form.component.html
index da2054554..133b34885 100644
--- a/src/app/component-library/edit-asset-form/edit-asset-form/edit-asset-form.component.html
+++ b/src/app/component-library/edit-asset-form/edit-asset-form/edit-asset-form.component.html
@@ -2,12 +2,12 @@
   <form class="flex flex-col gap-y-12 mt-4" [formGroup]="form.all">
     <edit-asset-form-group
       *ngIf="form.datasource"
-      myTitle="Datasource"
-      description="Define the datasource of the asset">
+      myTitle="{{ 'asset_page.datasource' | translate }}"
+      description="{{ 'create_data_offer.def_datasrc' | translate }}">
       <!-- Datasource Type -->
       <div>
         <edit-asset-form-label
-          label="Datasource Type"
+          label="{{ 'create_data_offer.data_type' | translate }}"
           htmlFor="create-asset-form-datasource-type"
           [ctrl]="
             form.datasource.controls.dataSourceAvailability
@@ -17,13 +17,13 @@
           aria-label="Select an option"
           [formControl]="form.datasource.controls.dataSourceAvailability">
           <mat-radio-button *ngIf="form.mode === 'EDIT'" value="Unchanged">
-            Keep the datasource unchanged.
+            {{ 'create_data_offer.keep_datasrc' | translate }}
           </mat-radio-button>
           <mat-radio-button value="On-Request">
-            I do not have a datasource.
+            {{ 'create_data_offer.no_datasrc' | translate }}
           </mat-radio-button>
           <mat-radio-button value="Datasource">
-            I want to connect to a datasource.
+            {{ 'create_data_offer.con_datasrc' | translate }}
           </mat-radio-button>
         </mat-radio-group>
       </div>
@@ -34,23 +34,20 @@
         <edit-asset-form-input
           class="mt-2"
           fieldId="create-asset-form-contact-email"
-          label="Contact E-Mail"
-          placeholder="contact@my-org.com"
+          label="{{ 'create_data_offer.contact_email' | translate }}"
+          placeholder="{{ 'create_data_offer.contact_email_placeholder' | translate }}"
           [ctrl]="form.datasource.controls.contactEmail"
-          >This email address will be offered to potential consumers for
-          contacting you. This is done in place of having an actual data source
-          connected.</edit-asset-form-input
+          >{{ 'create_data_offer.contact_email_descr' | translate }}</edit-asset-form-input
         >
 
         <!-- Contact E-Mail Subject for On Request Assets -->
         <edit-asset-form-input
           class="mt-5"
           fieldId="create-asset-form-contact-subject"
-          label="Preferred E-Mail Subject"
+          label="{{ 'create_data_offer.pref_email_sub' | translate }}"
           placeholder="Data Offer 'xyz'"
           [ctrl]="form.datasource.controls.contactPreferredEmailSubject"
-          >Will be added to the mailto-link and displayed to potential consumers
-          to use.</edit-asset-form-input
+          >{{ 'create_data_offer.pref_email_descr' | translate }}</edit-asset-form-input
         >
       </ng-container>
 
@@ -61,7 +58,7 @@
         <!-- Data Address Type -->
         <div class="mt-5">
           <edit-asset-form-data-address-type-select
-            label="Type"
+            label="{{ 'general.type' | translate}}"
             mode="Datasource-Create"
             [control]="form.datasource.controls.dataAddressType">
           </edit-asset-form-data-address-type-select>
@@ -84,7 +81,7 @@
           <!-- Method (Rest-Api) -->
           <div>
             <edit-asset-form-label
-              label="Http Method"
+              label="{{ 'general.method' | translate}}"
               htmlFor="create-asset-form-http-method"
               [ctrl]="
                 form.datasource.controls.httpMethod
@@ -100,8 +97,8 @@
                 </mat-option>
               </mat-select>
               <mat-hint class="mat-hint">
-                The consuming side <b>must</b> provide a Custom HTTP Method with
-                method parameterization enabled.</mat-hint
+  			    {{ 'asset_page.provide' | translate}}
+			  </mat-hint
               >
             </mat-form-field>
             <!-- Toggle Method Parametrization Button -->
@@ -113,8 +110,8 @@
                 mat-button
                 [color]="ctrl.value ? 'warn' : 'accent'"
                 (click)="$event.preventDefault(); ctrl.setValue(!ctrl.value)">
-                {{ ctrl.value ? 'Disable' : 'Enable' }}
-                Method Parameterization
+                {{ ctrl.value ? ( 'general.disable' | translate ) : ( 'general.enable' | translate ) }} 
+				{{ 'asset_page.method_para' | translate }}
               </button>
             </div>
           </div>
@@ -127,9 +124,8 @@
               [hideHint]="!form.proxyPath"
               [ctrl]="ctrl"
               [label]="form.proxyPath ? 'Base URL' : 'URL'"
-              >The consuming side <b>must</b> provide a Custom HTTP Subpath with
-              method parameterization enabled. The Custom HTTP Subpath will be
-              appended to the base path.</edit-asset-form-input
+              >{{ 'asset_page.http_subpath' | translate }}
+			  </edit-asset-form-input
             >
 
             <!-- Toggle Proxy Path Button -->
@@ -140,7 +136,7 @@
                 mat-button
                 [color]="ctrl.value ? 'warn' : 'accent'"
                 (click)="$event.preventDefault(); ctrl.setValue(!ctrl.value)">
-                {{ ctrl.value ? 'Disable' : 'Enable' }} Path Parameterization
+                {{ ctrl.value ? ( 'general.disable' | translate ) : ( 'general.enable' | translate ) }} {{ 'asset_page.method_para' | translate }}
               </button>
             </div>
           </div>
@@ -148,7 +144,7 @@
           <div class="mt-3">
             <edit-asset-form-label
               [label]="
-                (form.proxyQueryParams ? 'Default' : '') + ' Query Params'
+                (form.proxyQueryParams ? 'Default' : '') + ( 'asset_page.query_para' | translate )
               "></edit-asset-form-label>
             <div class="mt-6"></div>
             <div
@@ -198,7 +194,7 @@
                 color="warn"
                 style="height: 42px; margin-top: 4px; margin-left: 8px"
                 (click)="form.onHttpQueryParamsRemoveClick($event, i)">
-                Remove
+                {{ 'general.remove' | translate }}
               </button>
             </div>
             <mat-hint *ngIf="form.proxyQueryParams" class="mat-hint">
@@ -212,7 +208,7 @@
                 mat-button
                 color="accent"
                 (click)="form.onHttpQueryParamsAddClick($event)">
-                Add {{ form.proxyQueryParams ? 'Default' : '' }} Query Param
+                {{ 'general.add' | translate }} {{ form.proxyQueryParams ? 'Default' : '' }} {{ 'asset_page.query_para_single' | translate }}
               </button>
               <!-- Toggle Proxy Query Param Parameterization Button -->
               <button
@@ -220,17 +216,15 @@
                 mat-button
                 [color]="ctrl.value ? 'warn' : 'accent'"
                 (click)="$event.preventDefault(); ctrl.setValue(!ctrl.value)">
-                {{ ctrl.value ? 'Disable' : 'Enable' }} Query Param
-                Parameterization
+                {{ ctrl.value ? ( 'general.disable' | translate ) : ( 'general.enable' | translate ) }} {{ 'asset_page.query_parameter' | translate }}
               </button>
             </div>
           </div>
 
           <div class="flex flex-col gap-1 mt-3">
-            <edit-asset-form-label label="Request Body"></edit-asset-form-label>
+            <edit-asset-form-label label="{{ 'asset_page.request_body' | translate}}"></edit-asset-form-label>
             <mat-hint class="mat-hint">
-              The request body can only be set from the consumer side, if
-              parameterization is enabled.
+			  {{ 'asset_page.info_body' | translate }}
             </mat-hint>
             <!-- Toggle Proxy Body Button -->
             <div
@@ -240,15 +234,14 @@
                 mat-button
                 [color]="ctrl.value ? 'warn' : 'accent'"
                 (click)="$event.preventDefault(); ctrl.setValue(!ctrl.value)">
-                {{ ctrl.value ? 'Disable' : 'Enable' }} Request Body
-                Parameterization
+                {{ ctrl.value ? ( 'general.disable' | translate ) : ( 'general.enable' | translate ) }} {{ 'asset_page.request_para' | translate }}
               </button>
             </div>
           </div>
 
           <div class="flex flex-col gap-1 mt-3">
             <edit-asset-form-label
-              label="Authentication"></edit-asset-form-label>
+              label="{{ 'general.auth' | translate }}"></edit-asset-form-label>
             <!-- Add Authentication Button -->
             <div
               *ngIf="
@@ -263,7 +256,7 @@
                     'Vault-Secret'
                   )
                 ">
-                Add Authentication
+                {{ 'general.add' | translate }} {{ 'general.auth' | translate }}
               </button>
             </div>
             <!-- Auth Header Value Type -->
@@ -272,13 +265,13 @@
                 form.datasource.controls.httpAuthHeaderType.value !== 'None'
               "
               class="grow mt-4">
-              <mat-label>Type</mat-label>
+              <mat-label>{{ 'general.type' | translate }}</mat-label>
               <mat-select
                 [formControl]="form.datasource.controls.httpAuthHeaderType">
                 <mat-option value="Vault-Secret">
-                  Header with Vault Secret
+                  {{ 'general.header_sec' | translate }}
                 </mat-option>
-                <mat-option value="Value">Header with Value</mat-option>
+                <mat-option value="Value">{{ 'general.header_val' | translate }}</mat-option>
               </mat-select>
             </mat-form-field>
             <div
@@ -288,7 +281,7 @@
               class="flex flex-row space-x-[10px] -mt-3">
               <!-- Auth Header Name -->
               <mat-form-field class="w-1/3">
-                <mat-label>Auth Header Name</mat-label>
+                <mat-label>{{ 'general.auth_header' | translate }}</mat-label>
                 <input
                   matInput
                   placeholder="Authorization"
@@ -301,7 +294,7 @@
                   form.datasource.controls.httpAuthHeaderType.value === 'Value'
                 "
                 class="grow">
-                <mat-label>Auth Header Value</mat-label>
+                <mat-label>{{ 'general.auth_value' | translate }}</mat-label>
                 <input
                   matInput
                   placeholder="Bearer ..."
@@ -316,7 +309,7 @@
                   'Vault-Secret'
                 "
                 class="grow">
-                <mat-label>Vault Secret Name</mat-label>
+                <mat-label>{{ 'general.vault_secret' | translate }}</mat-label>
                 <input
                   matInput
                   placeholder="MySecret123"
@@ -337,14 +330,14 @@
                 (click)="
                   form.datasource.controls.httpAuthHeaderType.setValue('None')
                 ">
-                Remove Authentication
+                {{ 'general.remove' | translate }} {{ 'general.auth' | translate }}
               </button>
             </div>
           </div>
 
           <div class="mt-4">
             <edit-asset-form-label
-              label="Additional Headers"></edit-asset-form-label>
+              label="{{ 'general.add_header' | translate }}"></edit-asset-form-label>
             <div class="mt-8"></div>
             <div
               *ngFor="
@@ -354,7 +347,7 @@
               class="flex flex-row space-x-[10px] -mt-3">
               <!-- Header Name -->
               <mat-form-field class="w-1/3">
-                <mat-label>Header Name</mat-label>
+                <mat-label>{{ 'general.header_name' | translate }}</mat-label>
                 <input
                   matInput
                   placeholder="Header"
@@ -363,7 +356,7 @@
               </mat-form-field>
               <!-- Header Value -->
               <mat-form-field class="grow">
-                <mat-label>Header Value</mat-label>
+                <mat-label>{{ 'general.header_value' | translate }}</mat-label>
                 <input
                   matInput
                   placeholder="..."
@@ -376,7 +369,7 @@
                 color="warn"
                 style="height: 42px; margin-top: 4px; margin-left: 8px"
                 (click)="form.onHttpHeadersRemoveClick($event, i)">
-                Remove
+                {{ 'general.remove' | translate }}
               </button>
             </div>
             <!-- Add Header Button -->
@@ -385,7 +378,7 @@
                 mat-button
                 color="accent"
                 (click)="form.onHttpHeadersAddClick($event)">
-                Add Additional Header
+                {{ 'general.add' | translate }} {{ 'general.add_header' | translate }}
               </button>
             </div>
           </div>
@@ -394,13 +387,13 @@
     </edit-asset-form-group>
 
     <edit-asset-form-group
-      myTitle="General Information"
-      description="Fill out general information about the asset">
+      myTitle="{{ 'asset_page.information' | translate }}"
+      description="{{ 'asset_page.information_desc' | translate }}">
       <!-- Name -->
       <edit-asset-form-input
         fieldId="create-asset-form-name"
-        label="Name"
-        placeholder="My Asset"
+        label="{{ 'asset_page.name' | translate }}"
+        placeholder="{{ 'asset_page.my_asset' | translate }}"
         [ctrl]="form.general.controls.name"></edit-asset-form-input>
 
       <!-- ID -->
@@ -408,19 +401,19 @@
         *ngIf="form.general.controls.id; let ctrl"
         fieldId="create-asset-form-id"
         placeholder="my-asset"
-        label="ID"
+        label="{{ 'asset_page.asset_id' | translate}}"
         [ctrl]="ctrl"></edit-asset-form-input>
 
       <!-- Description -->
       <edit-asset-form-textarea
-        label="Description"
+        label="{{ 'asset_page.file_des' | translate }}"
         fieldId="create-asset-form-description"
         [placeholder]="
           '# My Asset\n\nAt vero eos et accusam et justo duo dolores et ea rebum.\n\n## Details\n\nAt vero eos et accusam et justo duo dolores et ea **rebum**.'
         "
         [ctrl]="form.general.controls.description">
         <div class="flex flex-row items-center gap-1 mb-1">
-          The description uses
+          {{ 'asset_page.descrip' | translate }}
           <a
             class="link"
             externalLink
@@ -433,27 +426,27 @@
       <!-- Keywords -->
       <div class="mt-3">
         <keyword-select
-          label="Keywords"
+          label="{{ 'asset_page.keywords' | translate }}"
           [control]="form.general.controls.keywords"></keyword-select>
       </div>
 
       <!-- Show Advanced Fields -->
       <mat-checkbox [formControl]="form.general.controls.showAdvancedFields"
-        >Show Advanced Fields</mat-checkbox
+        >{{ 'general.show_adv_fields' | translate }}</mat-checkbox
       >
 
       <ng-container *ngIf="form.general.value.showAdvancedFields">
         <!-- Version -->
         <edit-asset-form-input
           class="mt-4"
-          label="Version"
+          label="{{ 'asset_page.version' | translate }}"
           fieldId="create-asset-form-version"
           placeholder="1.0.0"
           [ctrl]="form.general.controls.version"></edit-asset-form-input>
 
         <!-- Language -->
         <language-select
-          label="Language"
+          label="{{ 'general.language' | translate }}"
           [control]="form.general.controls.language"></language-select>
       </ng-container>
     </edit-asset-form-group>
@@ -499,7 +492,7 @@
 
     <edit-asset-form-group
       *ngIf="form.general.value.showAdvancedFields"
-      myTitle="Documentation"
+      myTitle="{{ 'general.doc' | translate }}"
       description="Provide context information about the datasource">
       <!-- Endpoint Documentation -->
       <edit-asset-form-input
@@ -736,12 +729,12 @@
 
     <edit-asset-form-group
       *ngIf="form.mode === 'CREATE'"
-      myTitle="Publishing"
-      description="Publish data offer to other data space participants">
+      myTitle="{{ 'general.publishing' | translate }}"
+      description="{{ 'general.pub_desc' | translate }}">
       <!-- Publish Mode -->
       <div *ngIf="form.all.controls.publishMode; let ctrl">
         <edit-asset-form-label
-          label="Publishing Mode"
+          label="{{ 'general.pub_mode' | translate }}"
           htmlFor="create-asset-form-publish-type"
           [ctrl]="ctrl"></edit-asset-form-label>
         <mat-radio-group
@@ -749,13 +742,13 @@
           aria-label="Select an option"
           [formControl]="ctrl">
           <mat-radio-button value="PUBLISH_UNRESTRICTED">
-            Publish unrestricted
+            {{ 'general.pub_unrestr' | translate }}
           </mat-radio-button>
           <mat-radio-button value="PUBLISH_RESTRICTED">
-            Publish restricted
+            {{ 'general.pub_restr' | translate }}
           </mat-radio-button>
           <mat-radio-button value="DO_NOT_PUBLISH">
-            Do not publish
+            {{ 'general.pub_no' | translate }}
           </mat-radio-button>
         </mat-radio-group>
       </div>
@@ -763,7 +756,7 @@
       <!-- Policy Expression -->
       <div *ngIf="form.all.controls.publishMode.value === 'PUBLISH_RESTRICTED'">
         <edit-asset-form-label
-          label="Policy Expression"
+          label="{{ 'policy_definition_page.expression' | translate }}"
           [ctrl]="form.all.controls.policyControls"></edit-asset-form-label>
         <policy-form-expression
           [treeNode]="expressionFormHandler.tree.root"></policy-form-expression>
diff --git a/src/app/component-library/edit-asset-form/keyword-select/keyword-select.component.html b/src/app/component-library/edit-asset-form/keyword-select/keyword-select.component.html
index df7acea8e..4261195b9 100644
--- a/src/app/component-library/edit-asset-form/keyword-select/keyword-select.component.html
+++ b/src/app/component-library/edit-asset-form/keyword-select/keyword-select.component.html
@@ -12,12 +12,12 @@
       (removed)="remove(keyword)">
       {{ keyword }}
       <button matChipRemove>
-        <mat-icon>cancel</mat-icon>
+        <mat-icon>{{ 'general.cancel' | translate }}</mat-icon>
       </button>
     </mat-chip>
     <input
       id="create-asset-form-keywords"
-      placeholder="Add keyword..."
+      placeholder="{{ 'asset_page.add_keyword' | translate }}"
       [matChipInputAddOnBlur]="true"
       [matChipInputFor]="chipList"
       [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
diff --git a/src/app/component-library/edit-asset-form/language-select/language-select.component.html b/src/app/component-library/edit-asset-form/language-select/language-select.component.html
index 3d5df210a..da35c330e 100644
--- a/src/app/component-library/edit-asset-form/language-select/language-select.component.html
+++ b/src/app/component-library/edit-asset-form/language-select/language-select.component.html
@@ -1,5 +1,5 @@
 <edit-asset-form-label
-  label="Language"
+  label="{{ 'general.language' | translate }}"
   [ctrl]="control"></edit-asset-form-label>
 <mat-form-field class="w-full mt-1" color="accent">
   <mat-select [formControl]="control" [compareWith]="'id' | compareByField">
diff --git a/src/app/component-library/policy-editor/editor/policy-operator-select/policy-operator-select.component.ts b/src/app/component-library/policy-editor/editor/policy-operator-select/policy-operator-select.component.ts
index 4bcfa9595..90bfc6f25 100644
--- a/src/app/component-library/policy-editor/editor/policy-operator-select/policy-operator-select.component.ts
+++ b/src/app/component-library/policy-editor/editor/policy-operator-select/policy-operator-select.component.ts
@@ -1,6 +1,7 @@
 import {Component, HostBinding, Input} from '@angular/core';
 import {UntypedFormControl} from '@angular/forms';
 import {PolicyOperatorConfig} from '../../model/policy-operators';
+import {TranslateService} from '@ngx-translate/core';
 
 @Component({
   selector: 'policy-operator-select',
@@ -17,5 +18,8 @@ export class PolicyOperatorSelectComponent {
   @HostBinding('class.flex-row')
   cls = true;
 
-  label = 'Operator';
+  constructor(public translationService: TranslateService) {}
+  
+  label = this.translationService.instant('general.operator');
+  
 }
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog.component.html b/src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog.component.html
index 2eee6e6cb..aaf585c41 100644
--- a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog.component.html
+++ b/src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog.component.html
@@ -1,17 +1,17 @@
 <h1 mat-dialog-title>
-  {{ form.mode === 'CREATE' ? 'Create New Asset' : 'Edit Asset' }}
+  {{ form.mode === 'CREATE' ? ('asset_page.create_asset' | translate) : ('asset_page.edit_asset' | translate) }}
 </h1>
 <mat-dialog-content class="w-[800px]">
   <mat-vertical-stepper [linear]="true">
     <!-- Step: Metadata -->
     <mat-step [stepControl]="form.metadata">
       <form [formGroup]="form.metadata">
-        <ng-template matStepLabel>General Information</ng-template>
+        <ng-template matStepLabel>{{'asset_page.information' | translate}}</ng-template>
         <div class="flex flex-col mt-[10px]">
           <div class="flex flex-row space-x-[10px]">
             <!-- Name -->
             <mat-form-field class="grow">
-              <mat-label>Name</mat-label>
+              <mat-label>{{'asset_page.name' | translate}}</mat-label>
               <input
                 matInput
                 autocomplete="new-name"
@@ -20,7 +20,7 @@ <h1 mat-dialog-title>
 
             <!-- Version -->
             <mat-form-field class="grow">
-              <mat-label>Version</mat-label>
+              <mat-label>{{'asset_page.version' | translate}}</mat-label>
               <input
                 matInput
                 autocomplete="new-id"
@@ -33,7 +33,7 @@ <h1 mat-dialog-title>
           <mat-form-field
             *ngIf="form.metadata.controls.id; let ctrl"
             class="grow">
-            <mat-label>Asset ID</mat-label>
+            <mat-label>{{'asset_page.asset_id' | translate }}</mat-label>
             <input
               placeholder="my-asset-1"
               matInput
@@ -53,7 +53,7 @@ <h1 mat-dialog-title>
           <!-- Description -->
 
           <mat-form-field>
-            <mat-label>Description</mat-label>
+            <mat-label>{{'asset_page.file_des' | translate }}</mat-label>
             <textarea
               class="h-36"
               matInput
@@ -62,7 +62,7 @@ <h1 mat-dialog-title>
                 '# My Asset\n\nAt vero eos et accusam et justo duo dolores et ea rebum.\n\n## Details\n\nAt vero eos et accusam et justo duo dolores et ea **rebum**.'
               "></textarea>
             <mat-hint class="flex flex-row items-center gap-1 mb-1">
-              The description uses
+              {{'asset_page.descrip' | translate }}
               <a
                 class="link"
                 externalLink
@@ -76,19 +76,19 @@ <h1 mat-dialog-title>
 
           <!-- Keywords -->
           <keyword-select
-            label="Keywords"
+            label="{{'asset_page.keywords' | translate }}"
             [control]="form.metadata.controls.keywords"></keyword-select>
 
           <!-- Language -->
           <language-select
             class="grow"
-            label="Language"
+            label="{{'general.language' | translate }}"
             [control]="form.metadata.controls.language"></language-select>
 
           <div class="flex flex-row space-x-[10px]">
             <!-- Content Type -->
             <mat-form-field class="grow">
-              <mat-label>Content Type</mat-label>
+              <mat-label>{{'general.content' | translate }}</mat-label>
               <input
                 matInput
                 [formControl]="form.metadata.controls.contentType"
@@ -100,7 +100,7 @@ <h1 mat-dialog-title>
           <mat-form-field
             *ngIf="form.metadata.controls.endpointDocumentation; let ctrl"
             class="grow">
-            <mat-label>Endpoint Documentation</mat-label>
+            <mat-label>{{'general.endpoint_doc' | translate }}</mat-label>
             <input placeholder="https://" matInput [formControl]="ctrl" />
             <mat-error *ngIf="ctrl.invalid && ctrl.errors?.pattern">
               {{ validationMessages.invalidUrlMessage }}
@@ -112,7 +112,7 @@ <h1 mat-dialog-title>
             <mat-form-field
               *ngIf="form.metadata.controls.publisher; let ctrl"
               class="grow">
-              <mat-label>Publisher</mat-label>
+              <mat-label>{{'general.publisher' | translate }}</mat-label>
               <input placeholder="https://" matInput [formControl]="ctrl" />
               <mat-error *ngIf="ctrl.invalid && ctrl.errors?.pattern">
                 {{ validationMessages.invalidUrlMessage }}
@@ -123,7 +123,7 @@ <h1 mat-dialog-title>
             <mat-form-field
               *ngIf="form.metadata.controls.standardLicense; let ctrl"
               class="grow">
-              <mat-label>Standard License</mat-label>
+              <mat-label>{{'general.st_license' | translate }}</mat-label>
               <input placeholder="https://" matInput [formControl]="ctrl" />
               <mat-error *ngIf="ctrl.invalid && ctrl.errors?.pattern">
                 {{ validationMessages.invalidUrlMessage }}
@@ -136,7 +136,7 @@ <h1 mat-dialog-title>
     <!-- Step: Advanced -->
     <mat-step *ngIf="form.advanced" [stepControl]="form.advanced">
       <form [formGroup]="form.advanced">
-        <ng-template matStepLabel>Advanced Information</ng-template>
+        <ng-template matStepLabel>{{ 'general.ad_inf' | translate}}</ng-template>
         <div class="flex flex-col mt-[10px]">
           <div class="flex flex-row space-x-[10px]">
             <!-- Data Category -->
@@ -377,12 +377,12 @@ <h1 mat-dialog-title>
     <!-- Step: Datasource -->
     <mat-step *ngIf="form.datasource" [stepControl]="form.datasource">
       <form [formGroup]="form.datasource">
-        <ng-template matStepLabel>Datasource Information</ng-template>
-        <div class="form-section-title">Datasource</div>
+        <ng-template matStepLabel>{{ 'asset_page.datasource_info' | translate }}</ng-template>
+        <div class="form-section-title">{{ 'asset_page.datasource' | translate }}</div>
         <div class="flex flex-col mt-[10px]">
           <!-- Data Address Type -->
           <data-address-type-select
-            label="Type"
+            label="{{ 'general.type' | translate }}"
             [mode]="form.mode === 'EDIT' ? 'Datasink' : 'Datasource-Create'"
             [control]="
               form.datasource.controls.dataAddressType
@@ -395,7 +395,7 @@ <h1 mat-dialog-title>
                 form.datasource.controls.dataDestination;
               let ctrl
             ">
-            <mat-label>Custom Datasource Config (JSON)</mat-label>
+            <mat-label>{{ 'asset_page.datasource_config' | translate }}</mat-label>
             <textarea
               matInput
               placeholder='{"https://w3id.org/edc/v0.0.1/ns/type": "HttpData", ...}'
@@ -453,11 +453,10 @@ <h1 mat-dialog-title>
 
           <!-- Data Source Type HTTP -->
           <ng-container *ngIf="form.dataAddressType === 'Http'">
-            <div class="form-section-title">Method</div>
+            <div class="form-section-title">{{ 'general.method' | translate }}</div>
 
             <div *ngIf="form.proxyMethod" class="mb-[10px] px-[3px] text-sm">
-              The consuming side <b>must</b> provide a Custom HTTP Method with
-              method parameterization enabled.
+              {{ 'asset_page.provide' | translate }}
             </div>
 
             <!-- Method (Rest-Api) -->
@@ -465,7 +464,7 @@ <h1 mat-dialog-title>
               <mat-form-field
                 *ngIf="form.datasource.controls.httpMethod; let ctrl">
                 <mat-label>
-                  {{ form.proxyMethod ? 'Default' : '' }} Method
+                  {{ form.proxyMethod ? 'Default' : '' }} {{ 'general.method' | translate }}
                 </mat-label>
                 <mat-select [formControl]="ctrl">
                   <mat-option *ngFor="let method of methods" [value]="method"
@@ -483,16 +482,14 @@ <h1 mat-dialog-title>
                 mat-button
                 [color]="ctrl.value ? 'warn' : 'accent'"
                 (click)="ctrl.setValue(!ctrl.value)">
-                {{ ctrl.value ? 'Disable' : 'Enable' }} Method Parameterization
+                {{ ctrl.value ? ('general.disable' | translate) : ('general.enable' | translate)}} {{ 'asset_page.method_para' | translate }}
               </button>
             </div>
 
             <div class="form-section-title">URL</div>
 
             <div *ngIf="form.proxyPath" class="mb-[10px] px-[3px] text-sm">
-              The consuming side <b>must</b> provide a Custom HTTP Subpath with
-              method parameterization is enabled. The Custom HTTP Subpath will
-              be appended to the base path.
+  			  {{ 'asset_page.http_subpath' | translate }}
             </div>
 
             <!-- Base Path (Rest-Api) -->
@@ -515,12 +512,12 @@ <h1 mat-dialog-title>
                 mat-button
                 [color]="ctrl.value ? 'warn' : 'accent'"
                 (click)="ctrl.setValue(!ctrl.value)">
-                {{ ctrl.value ? 'Disable' : 'Enable' }} Path Parameterization
+                {{ ctrl.value ? ('general.disable' | translate) : ('general.enable' | translate)}} {{ 'asset_page.path_para' | translate }}
               </button>
             </div>
 
             <div class="form-section-title">
-              {{ form.proxyQueryParams ? 'Default' : '' }} Query Params
+              {{ form.proxyQueryParams ? 'Default' : '' }} {{ 'asset_page.query_para' | translate }}
             </div>
 
             <div
@@ -531,7 +528,7 @@ <h1 mat-dialog-title>
               class="flex flex-row space-x-[10px]">
               <!-- Query Param Name -->
               <mat-form-field class="w-1/3">
-                <mat-label>Query Param Name</mat-label>
+                <mat-label>{{ 'asset_page.query_name' | translate }}</mat-label>
                 <input
                   matInput
                   placeholder="key"
@@ -550,7 +547,7 @@ <h1 mat-dialog-title>
 
               <!-- Query Param Value -->
               <mat-form-field class="grow">
-                <mat-label>Value</mat-label>
+                <mat-label>{{ 'general.value' | translate }}</mat-label>
                 <input
                   matInput
                   placeholder="..."
@@ -571,16 +568,14 @@ <h1 mat-dialog-title>
                 color="warn"
                 style="height: 54px; margin-top: 4px; margin-left: 8px"
                 (click)="form.onHttpQueryParamsRemoveClick(i)">
-                Remove
+                {{ 'general.remove' | translate }}
               </button>
             </div>
 
             <div
               *ngIf="form.proxyQueryParams"
               class="text-sm mb-[10px] px-[3px]">
-              With query param parameterization enabled, the default query
-              params and the query params provided by the consumer will be
-              merged.
+              {{ 'asset_page.default_query' | translate }}
             </div>
 
             <div class="flex flex-row mb-[10px] space-x-[10px]">
@@ -589,7 +584,7 @@ <h1 mat-dialog-title>
                 mat-button
                 color="accent"
                 (click)="form.onHttpQueryParamsAddClick()">
-                Add {{ form.proxyQueryParams ? 'Default' : '' }} Query Param
+                {{ 'general.add' | translate }} {{ form.proxyQueryParams ? 'Default' : '' }} {{ 'asset_page.query_para_single' | translate }}
               </button>
 
               <!-- Toggle Proxy Query Param Parameterization Button -->
@@ -598,16 +593,15 @@ <h1 mat-dialog-title>
                 mat-button
                 [color]="ctrl.value ? 'warn' : 'accent'"
                 (click)="ctrl.setValue(!ctrl.value)">
-                {{ ctrl.value ? 'Disable' : 'Enable' }} Query Param
+                {{ ctrl.value ? ('general.disable' | translate) : ('general.enable' | translate) }} {{ 'asset_page.query_para_single' | translate }}
                 Parameterization
               </button>
             </div>
 
-            <div class="form-section-title">Request Body</div>
+            <div class="form-section-title">{{ 'asset_page.request_body' | translate }}</div>
 
             <div class="text-sm mb-[10px] px-[3px]">
-              The request body can only be set from the consumer side, if
-              parameterization is enabled.
+              {{ 'asset_page.info_body' | translate }}
             </div>
 
             <!-- Toggle Proxy Body Button -->
@@ -618,12 +612,11 @@ <h1 mat-dialog-title>
                 mat-button
                 [color]="ctrl.value ? 'warn' : 'accent'"
                 (click)="ctrl.setValue(!ctrl.value)">
-                {{ ctrl.value ? 'Disable' : 'Enable' }} Request Body
-                Parameterization
+                {{ ctrl.value ? ('general.disable' | translate) : ('general.enable' | translate) }} {{ 'asset_page.request_para' | translate }}
               </button>
             </div>
 
-            <div class="form-section-title">Authentication</div>
+            <div class="form-section-title">{{ 'general.auth' | translate }}</div>
 
             <!-- Add Authentication Button -->
             <div
@@ -639,7 +632,7 @@ <h1 mat-dialog-title>
                     'Vault-Secret'
                   )
                 ">
-                Add Authentication
+                {{ 'general.add_auth' | translate }} 
               </button>
             </div>
 
@@ -653,9 +646,9 @@ <h1 mat-dialog-title>
               <mat-select
                 [formControl]="form.datasource.controls.httpAuthHeaderType">
                 <mat-option value="Vault-Secret">
-                  Header with Vault Secret
+                  {{ 'general.header_sec' | translate }}
                 </mat-option>
-                <mat-option value="Value">Header with Value</mat-option>
+                <mat-option value="Value">{{ 'general.header_val' | translate }}</mat-option>
               </mat-select>
             </mat-form-field>
             <div
@@ -665,7 +658,7 @@ <h1 mat-dialog-title>
               class="flex flex-row space-x-[10px]">
               <!-- Auth Header Name -->
               <mat-form-field class="w-1/3">
-                <mat-label>Auth Header Name</mat-label>
+                <mat-label>{{ 'general.auth_header' | translate }}</mat-label>
                 <input
                   matInput
                   placeholder="Authorization"
@@ -679,7 +672,7 @@ <h1 mat-dialog-title>
                   form.datasource.controls.httpAuthHeaderType.value === 'Value'
                 "
                 class="grow">
-                <mat-label>Auth Header Value</mat-label>
+                <mat-label>{{ 'general.auth_value' | translate }}</mat-label>
                 <input
                   matInput
                   placeholder="Bearer ..."
@@ -695,7 +688,7 @@ <h1 mat-dialog-title>
                   'Vault-Secret'
                 "
                 class="grow">
-                <mat-label>Vault Secret Name</mat-label>
+                <mat-label>{{ 'general.vault_secret' | translate }}</mat-label>
                 <input
                   matInput
                   placeholder="MySecret123"
@@ -717,11 +710,11 @@ <h1 mat-dialog-title>
                 (click)="
                   form.datasource.controls.httpAuthHeaderType.setValue('None')
                 ">
-                Remove Authentication
+                {{ 'general.rem_auth' | translate }} 
               </button>
             </div>
 
-            <div class="form-section-title">Additional Headers</div>
+            <div class="form-section-title">{{ 'general.add_header' | translate }}</div>
 
             <div
               *ngFor="
@@ -731,7 +724,7 @@ <h1 mat-dialog-title>
               class="flex flex-row space-x-[10px]">
               <!-- Header Name -->
               <mat-form-field class="w-1/3">
-                <mat-label>Header Name</mat-label>
+                <mat-label>{{ 'general.header_name' | translate }}</mat-label>
                 <input
                   matInput
                   placeholder="Header"
@@ -741,7 +734,7 @@ <h1 mat-dialog-title>
 
               <!-- Header Value -->
               <mat-form-field class="grow">
-                <mat-label>Header Value</mat-label>
+                <mat-label>{{ 'general.header_value' | translate }}</mat-label>
                 <input
                   matInput
                   placeholder="..."
@@ -755,7 +748,7 @@ <h1 mat-dialog-title>
                 color="warn"
                 style="height: 54px; margin-top: 4px; margin-left: 8px"
                 (click)="form.onHttpHeadersRemoveClick(i)">
-                Remove
+                {{ 'general.remove' | translate }}
               </button>
             </div>
 
@@ -765,7 +758,7 @@ <h1 mat-dialog-title>
                 mat-button
                 color="accent"
                 (click)="form.onHttpHeadersAddClick()">
-                Add Additional Header
+                {{ 'general.add_add_header' | translate }}
               </button>
             </div>
           </ng-container>
@@ -781,7 +774,7 @@ <h1 mat-dialog-title>
     color="default"
     [mat-dialog-close]="null"
     [disabled]="loading">
-    Cancel
+    {{ 'general.cancel' | translate }}
   </button>
 
   <button
@@ -789,6 +782,6 @@ <h1 mat-dialog-title>
     color="primary"
     [disabled]="!form.all.valid || loading"
     (click)="onSave()">
-    {{ form.mode === 'CREATE' ? 'Create' : 'Update' }}
+    {{ form.mode === 'CREATE' ? ('general.create' | translate ) : ('general.update' | translate ) }}
   </button>
 </mat-dialog-actions>
diff --git a/src/app/routes/connector-ui/asset-page/keyword-select/keyword-select.component.html b/src/app/routes/connector-ui/asset-page/keyword-select/keyword-select.component.html
index 198ba94b7..0a532b75a 100644
--- a/src/app/routes/connector-ui/asset-page/keyword-select/keyword-select.component.html
+++ b/src/app/routes/connector-ui/asset-page/keyword-select/keyword-select.component.html
@@ -9,11 +9,11 @@
       (removed)="remove(keyword)">
       {{ keyword }}
       <button matChipRemove>
-        <mat-icon>cancel</mat-icon>
+        <mat-icon>{{ 'general.cancel' | translate }}</mat-icon>
       </button>
     </mat-chip>
     <input
-      placeholder="Add keyword..."
+      placeholder="{{ 'asset_page.add_keyword' | translate }}"
       [matChipInputAddOnBlur]="true"
       [matChipInputFor]="chipList"
       [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
diff --git a/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page.module.ts b/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page.module.ts
index f1c4e1004..accc15f68 100644
--- a/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page.module.ts
+++ b/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page.module.ts
@@ -23,6 +23,7 @@ import {PipesAndDirectivesModule} from '../../../component-library/pipes-and-dir
 import {PolicyEditorModule} from '../../../component-library/policy-editor/policy-editor.module';
 import {UiElementsModule} from '../../../component-library/ui-elements/ui-elements.module';
 import {PolicyDefinitionCreatePageComponent} from './policy-definition-create-page/policy-definition-create-page.component';
+import {TranslateModule} from '@ngx-translate/core';
 
 @NgModule({
   imports: [
@@ -31,6 +32,7 @@ import {PolicyDefinitionCreatePageComponent} from './policy-definition-create-pa
     FormsModule,
     ReactiveFormsModule,
     RouterModule,
+    TranslateModule,
 
     // Angular Material
     MatBadgeModule,
diff --git a/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page.component.html b/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page.component.html
index 06b7ef5d3..115c00de4 100644
--- a/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page.component.html
+++ b/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page.component.html
@@ -1,5 +1,5 @@
 <div class="p-10 flex flex-col">
-  <div class="form-section-title">Policy Metadata</div>
+  <div class="form-section-title">{{ 'policy_definition_page.metadata' | translate }}</div>
   <!--  ID -->
   <mat-form-field
     *ngIf="form.group.controls.id; let ctrl"
@@ -12,14 +12,14 @@
     }}</mat-error>
   </mat-form-field>
 
-  <div class="form-section-title">Policy Expression</div>
+  <div class="form-section-title">{{ 'policy_definition_page.expression' | translate }}</div>
 
   <policy-form-expression
     [treeNode]="expressionFormHandler.tree.root"></policy-form-expression>
 
   <div class="flex justify-end gap-4 my-4">
     <button mat-stroked-button routerLink="/policies" [disabled]="loading">
-      Cancel
+      {{ 'general.cancel' | translate }}
     </button>
 
     <button
@@ -27,7 +27,7 @@
       mat-raised-button
       [disabled]="loading || !form.group.valid"
       (click)="onSave()">
-      Create
+      {{ 'general.create' | translate }}
     </button>
   </div>
 </div>
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index 0b22ffb34..501e23bbd 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -16,8 +16,8 @@
     "detail": "Details",
     "warn": "Warnung",
     "title": "Titel",
-    "disable": "Deaktivieren",
-    "enable": "Aktivieren",
+    "disable": "Deaktiviere",
+    "enable": "Aktiviere",
     "show": "Zeige",
     "hide": "Verberge",
     "description": "Beschreibung",
@@ -28,6 +28,7 @@
     "value": "Wert",
     "method": "Methode",
     "method_para": "Parametrisierung der Methode",
+    "type": "Typ",
     "path": "Pfad",
     "params": "Abfrageparameter",
     "add_properties": "Weitere Eigenschaften",
@@ -65,6 +66,7 @@
     "consuming": "Eingehend",
     "providing": "Ausgehend",
     "endpoint": "Konnektor Endpunkt",
+    "doc": "Dokumentation",
     "endpoint_doc": "Endpunkt Dokumentation",
     "content": "Inhaltstyp",
     "publisher": "Anbieter",
@@ -84,7 +86,16 @@
     "add_header": "Zusätzliche Kopfzeilen",
     "header_name": "Kopfzeilen-Name",
     "header_value": "Kopfzeilen-Wert",
-    "add_add_header": "Füge zusätzliche Kopfzeile hinzu"
+    "add_add_header": "Füge zusätzliche Kopfzeile hinzu",
+	"operator": "Operator",
+	"show_adv_fields": "Erweiterte Felder anzeigen",
+	"publishing": "Veröffentlichung",
+	"publish": "veröffentlichen" ,
+	"pub_desc": "Datenangebot an andere Datenraumteilnehmer veröffentlichen",
+	"pub_unrestr": "Uneingeschränkt veröffentlichen",
+	"pub_restr": "Eingeschränkt veröffentlichen",
+	"pub_no": "Nicht veröffentlichen",
+	"pub_mode": "Veröffentlichungsmodus"
   },
   "tooltip": {
     "negotiate": "Sie können keine Verträge mit Ihrem eigenen Konnektor aushandeln.",
@@ -139,10 +150,25 @@
     "maintainer": "Name der betreuenden Organisation",
     "main_url": "URL betreuende Organisation"
   },
+  "create_data_offer": {
+    "def_datasrc": "Definieren Sie die Datenquelle für das Asset",
+	"data_type": "Datenquellen Typ",
+	"contact_email": "Kontakt E-Mail",
+	"contact_email_placeholder": "kontakt@ihre-org.com",
+	"contact_email_descr": "Diese E-Mail-Adresse wird potenziellen Kunden zur Kontaktaufnahme mit Ihnen angeboten. Dies geschieht anstelle der Anbindung einer tatsächlichen Datenquelle.",
+	"pref_email_sub": "Bevorzugter E-Mail-Betreff",
+	"pref_email_descr": "Wird dem Mailto-Link hinzugefügt und potenziellen Verbrauchern zur Nutzung angezeigt.",
+	"keep_datasrc": "Datenquelle beibehalten.",
+	"no_datasrc": "Ich habe keine Datenquelle.",
+	"con_datasrc": "Ich möchte eine Verbindung zu einer Datenquelle herstellen."
+  },
   "asset_page": {
     "information": "Generelle Informationen",
+	"information_desc": "Füllen Sie allgemeine Informationen über das Asset aus.",
+	"my_asset": "Mein Asset",
     "asset_id": "Datenbestand-ID",
-    "keywords": "Passwort",
+    "keywords": "Stichwörter",
+    "add_keyword": "Stichwörter hinzufügen...",
     "legal_name": "Rechtlicher Name des Dateninhabers",
     "add_file": "Referenzdatei hinzufügen",
     "file_des": "Beschreibung der Referenzdateien",
@@ -154,7 +180,9 @@
     "provide": "Die konsumierende Seite muss eine benutzerdefinierte HTTP-Methode mit aktivierter Methodenparametrisierung bereitstellen.",
     "http_subpath": "Die konsumierende Seite muss einen benutzerdefinierten HTTP-Unterpfad bereitstellen, bei dem die Methodenparametrisierung aktiviert ist. Der benutzerdefinierte HTTP-Teilpfad wird an den Basispfad angehängt.",
     "path_para": "Pfadparametrisierung",
+    "method_para": "Methodenparameterization",
     "query_para": "Abfrageparameter",
+    "query_para_single": "Abfrageparameter",
     "query_name": "Abfrage Parametername",
     "default_query": "Wenn die Parametrisierung von Abfrageparametern aktiviert ist, werden die Standardabfrageparameter und die vom Verbraucher bereitgestellten Abfrageparameter zusammengeführt.",
     "query_parameter": " Parametrisierung von Abfrageparametern",
@@ -168,7 +196,9 @@
     "no_assets": "Keine Datenbestände mit gegebenem Filter gefunden.",
     "descrip": "Die Beschreibung nutzt",
     "add_loc": "Füge Ort hinzu",
-    "add_sample": "Füge Beispieldaten hinzu"
+    "add_sample": "Füge Beispieldaten hinzu",
+    "name": "Name",
+    "version": "Version"
   },
   "catalog_browser_page": {
     "fetch": "Status abrufen",
@@ -268,6 +298,8 @@
   },
   "policy_definition_page": {
     "create_pol": "Erstelle eine neue Richtlinie",
+    "metadata": "Richtlinie Metadata",
+    "expression": "Richtlinieausdruck",
     "time_res": "Zeitlich begrenzter Zeitraum",
     "conn_res": "Anschluss mit vom Konnektor eingeschränkter Nutzung",
     "date_range": "Datumsbereich",
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index d8a8e6d42..4b97b47fe 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -28,6 +28,7 @@
     "value": "Value",
     "method": "Method",
     "method_para": "Method Parameterization",
+    "type": "Type",
     "path": "Path",
     "params": "Query Params",
     "add_properties": "Additional Properties",
@@ -65,6 +66,7 @@
     "consuming": "Consuming",
     "providing": "Providing",
     "endpoint": "Connector Endpoint",
+    "doc": "Documentation",
     "endpoint_doc": "Endpoint Documentation",
     "content": "Content Type",
     "publisher": "Publisher",
@@ -84,7 +86,16 @@
     "add_header": "Additional Headers",
     "header_name": "Header Name",
     "header_value": "Header Value",
-    "add_add_header": "Add Additional Header"
+    "add_add_header": "Add Additional Header",
+	"operator": "Operator",
+	"show_adv_fields": "Show Advanced Fields",
+	"publishing": "Publishing",
+	"publish": "Publish" ,
+	"pub_desc": "Publish data offer to other data space participants",
+	"pub_unrestr": "Publish unrestricted",
+	"pub_restr": "Publish restricted",
+	"pub_no": "Do not publish",
+	"pub_mode": "Publishing Mode"
   },
   "tooltip": {
     "negotiate": "Cannot negotiate contracts with your own connector.",
@@ -139,10 +150,25 @@
     "maintainer": "Maintainer Organization Name",
     "main_url": "Maintainer URL"
   },
+  "create_data_offer": {
+    "def_datasrc": "Define the datasource of the asset",
+	"data_type": "Datasource Type",
+	"contact_email": "Contact E-Mail",
+	"contact_email_placeholder": "contact@my-org.com",
+	"contact_email_descr": "This email address will be offered to potential consumers for contacting you. This is done in place of having an actual data source connected.",
+	"pref_email_sub": "Preferred E-Mail Subject",
+	"pref_email_descr": "Will be added to the mailto-link and displayed to potential consumers to use.",
+	"keep_datasrc": "Keep the datasource unchanged.",
+	"no_datasrc": "I do not have a datasource.",
+	"con_datasrc": "I want to connect to a datasource."
+  },
   "asset_page": {
     "information": "General Information",
+	"information_desc": "Fill out general information about the asset.",
+	"my_asset": "My Asset",
     "asset_id": "Asset ID",
     "keywords": "Keywords",
+    "add_keyword": "Add keyword...",
     "legal_name": "Legal name of the data owner",
     "add_file": "Add reference file",
     "file_des": "Reference files description",
@@ -154,7 +180,9 @@
     "provide": "The consuming side must provide a Custom HTTP Method with method parameterization enabled.",
     "http_subpath": "The consuming side must provide a Custom HTTP Subpath with method parameterization is enabled. The Custom HTTP Subpath will be appended to the base path.",
     "path_para": "Path Parameterization",
+    "method_para": "Method Parameterization",
     "query_para": "Query Params",
+    "query_para_single": "Query Param",
     "query_name": "Query Param Name",
     "default_query": "With query param parameterization enabled, the default query params and the query params provided by the consumer will be merged.",
     "query_parameter": " Query Param Parameterization",
@@ -168,7 +196,9 @@
     "no_assets": "No assets found with given filter.",
     "descrip": "The description uses",
     "add_loc": "Add location",
-    "add_sample": "Add data sample"
+    "add_sample": "Add data sample",
+    "name": "Name",
+    "version": "Version"
   },
   "catalog_browser_page": {
     "fetch": "Fetch Status",
@@ -268,6 +298,8 @@
   },
   "policy_definition_page": {
     "create_pol": "Create New Policy",
+    "metadata": "Policy Metadata",
+    "expression": "Policy Expression",
     "time_res": "Time-Period-Restricted",
     "conn_res": "Connector-Restricted-Usage",
     "date_range": "Date Range",

From c8136e4025c44dd437a0180580c607096357d24b Mon Sep 17 00:00:00 2001
From: Richard Treier <richard.treier@sovity.de>
Date: Mon, 16 Sep 2024 11:24:59 +0200
Subject: [PATCH 3/5] post i18n merge hell, shared module refactoring, NOTICE
 file, german translations are currently broken TODO

---
 NOTICE                                        |   11 +
 src/app/app-routing.module.ts                 |    4 +-
 src/app/app.module.ts                         |   30 +-
 .../catalog/catalog.module.ts                 |   84 --
 ...truncated-short-description.component.html |    9 -
 .../conditions-for-use-dialog.module.ts       |   39 -
 .../confirmation-dialog.module.ts             |   40 -
 .../data-address/data-address.module.ts       |   21 -
 .../edit-asset-form/edit-asset-form.module.ts |   96 --
 ...e-negotiation-confirm-tos-dialog.module.ts |   34 -
 .../json-dialog/json-dialog.module.ts         |   48 -
 .../markdown-description.module.ts            |   40 -
 .../pipes-and-directives.module.ts            |   41 -
 .../policy-editor/model/policy-mapper.ts      |  132 --
 .../model/policy-multi-expressions.ts         |   28 -
 .../policy-editor/model/policy-operators.ts   |   77 -
 .../policy-editor/model/policy-verbs.ts       |   54 -
 .../policy-editor/policy-editor.module.ts     |   59 -
 .../property-grid/property-grid.module.ts     |   38 -
 .../ui-elements/ui-elements.module.ts         |   43 -
 .../url-list-dialog/url-list-dialog.module.ts |   46 -
 src/app/core/adapters/custom-date-adapter.ts  |    2 +
 .../connector-fake-impl/data/test-policies.ts |    4 +-
 .../policy-definition-fake-service.ts         |    2 +-
 .../api/fake-backend/edc-fake-backend.ts      |    6 +-
 src/app/core/services/asset-builder.ts        |   16 +-
 .../asset-data-source-mapper-legacy.ts        |    4 +-
 .../core/services/asset-data-source-mapper.ts |    4 +-
 .../services/asset-request-builder-legacy.ts  |   22 +-
 .../core/services/asset-request-builder.ts    |    2 +-
 ...nector-info-property-grid-group-builder.ts |   30 +-
 .../services/contract-negotiation.service.ts  |    8 +-
 .../core/services/models/contract-offer.ts    |    2 +-
 .../core/services/models/ui-asset-mapped.ts   |    8 +-
 src/app/core/services/nav-items-builder.ts    |   32 +-
 src/app/core/services/page-title-strategy.ts  |   40 +-
 .../services/participant-id-localization.ts   |    6 -
 src/app/core/services/query-params-mapper.ts  |    2 +-
 src/app/core/services/title-utils.service.ts  |   52 -
 .../services/transfer-data-sink-mapper.ts     |    2 +-
 src/app/core/utils/form-value-utils.ts        |    2 +-
 src/app/core/utils/lazy-utils.ts              |   21 +
 .../asset-edit-page/asset-edit-page.module.ts |    6 +-
 .../asset-edit-page.component.ts              |   26 +-
 .../asset-cards/asset-cards.component.html    |    0
 .../asset-cards/asset-cards.component.ts      |    0
 .../asset-create-dialog-data.ts               |    5 +
 .../asset-create-dialog-mode.ts               |    1 +
 .../asset-create-dialog-result.ts}            |    2 +-
 .../asset-create-dialog.component.html}       |  151 +-
 .../asset-create-dialog.component.ts}         |   54 +-
 .../asset-create-dialog.service.ts            |   35 +
 .../assets-id-validator-builder.ts            |    0
 .../form/asset-advanced-form-builder.ts       |    4 +-
 .../form/asset-create-dialog-form-mapper.ts   |   60 +
 .../form/asset-create-dialog-form.ts}         |   58 +-
 .../form/asset-datasource-form-builder.ts     |    0
 .../form/asset-metadata-form-builder.ts       |   16 +-
 .../asset-create-dialog}/form/http-methods.ts |    0
 .../form/model/asset-advanced-form-model.ts   |   10 +-
 .../model/asset-create-dialog-form-model.ts   |   19 +
 .../asset-datasource-form-enabled-ctrls.ts    |    0
 .../form/model/asset-datasource-form-model.ts |    6 +-
 .../form/model/asset-metadata-form-model.ts   |    6 +-
 .../model/http-datasource-auth-header-type.ts |    0
 .../http-datasource-header-form-model.ts      |    4 +-
 .../http-datasource-query-param-form-model.ts |    4 +-
 .../model/temporal-coverage-form-model.ts     |    4 +-
 .../asset-list-page/asset-list-page.module.ts |   31 +
 .../asset-list-page.component.html}           |   13 +-
 .../asset-list-page.component.scss}           |    0
 .../asset-list-page.component.ts}             |   23 +-
 .../asset-edit-dialog-data.ts                 |    5 -
 .../asset-edit-dialog-mode.ts                 |    1 -
 .../asset-edit-dialog.service.ts              |   44 -
 .../form/asset-edit-dialog-form-mapper.ts     |  107 --
 .../model/asset-editor-dialog-form-model.ts   |   21 -
 .../asset-page/asset-page.module.ts           |   94 --
 .../data-category-select-data.ts              |   48 -
 .../data-category-select-item.service.ts      |   34 -
 .../data-category-select-item.ts              |    4 -
 .../data-category-select.component.html       |    9 -
 .../data-category-select.component.ts         |   22 -
 .../data-subcategory-items.pipe.ts            |   17 -
 .../data-subcategory-select-data.ts           |  189 ---
 .../data-subcategory-select-item.service.ts   |   44 -
 .../data-subcategory-select-item.ts           |    5 -
 .../data-subcategory-select.component.html    |   11 -
 .../data-subcategory-select.component.ts      |   23 -
 .../keyword-select.component.html             |   29 -
 .../keyword-select.component.ts               |   38 -
 .../language-select/language-select-data.ts   | 1299 -----------------
 .../language-select-item.service.ts           |   70 -
 .../language-select/language-select-item.ts   |    7 -
 .../language-select.component.html            |   16 -
 .../language-select.component.ts              |   22 -
 .../transport-mode-select-data.ts             |   23 -
 .../transport-mode-select-item.service.ts     |   27 -
 .../transport-mode-select-item.ts             |    4 -
 .../transport-mode-select.component.html      |    9 -
 .../transport-mode-select.component.ts        |   22 -
 ...browser-fetch-detail-dialog.component.html |    7 -
 .../catalog-browser-page.module.ts            |   73 +-
 .../catalog-browser-page.component.html       |   13 +-
 .../catalog-browser-page.component.ts         |   13 +-
 .../data-offer-builder.ts                     |    8 +-
 .../connector-ui-routing.module.ts            |   40 +-
 .../connector-ui/connector-ui.component.html  |   18 +-
 .../connector-ui/connector-ui.component.scss  |   18 -
 .../connector-ui/connector-ui.component.ts    |   12 +-
 .../connector-ui/connector-ui.module.ts       |   47 +-
 .../contract-agreement-cards.component.html   |    7 -
 .../contract-agreement-page.module.ts         |   61 +-
 .../contract-agreement-page.component.html    |   11 +-
 .../contract-agreement-page.component.ts      |    4 +-
 ...ct-agreement-transfer-dialog-form-model.ts |    4 +-
 ...contract-agreement-transfer-dialog-form.ts |    6 +-
 ...t-agreement-transfer-dialog.component.html |    9 +-
 ...act-agreement-transfer-dialog.component.ts |    8 +-
 .../asset-select/asset-select.component.ts    |    4 +-
 .../contract-definition-cards.component.html  |    6 +-
 .../contract-definition-cards.component.ts    |   18 +-
 ...ct-definition-editor-dialog.component.html |   12 +-
 .../contract-definition-page.module.ts        |   51 +-
 .../contract-definition-page.component.html   |    8 +-
 .../dashboard-page/dashboard-page.module.ts   |   59 +-
 .../dashboard-page-data.service.ts            |    6 -
 .../dashboard-page/dashboard-page-data.ts     |    2 +-
 .../dashboard-page.component.html             |  201 ++-
 .../language-selector.component.html          |   33 -
 .../language-selector.component.scss          |   16 -
 .../language-selector.component.spec.ts       |   26 -
 .../language-selector.component.ts            |   36 -
 .../page-not-found-page.component.html}       |    0
 .../page-not-found-page.component.ts}         |    6 +-
 .../page-not-found-page.module.ts             |   15 +
 .../policy-definition-create-page.module.ts   |   46 +-
 .../policy-definition-create-page-form.ts     |    2 +-
 ...licy-definition-create-page.component.html |    8 +-
 ...policy-definition-create-page.component.ts |   19 +-
 .../policy-cards/policy-card-builder.ts       |    2 +-
 .../policy-cards/policy-card.ts               |    2 +-
 .../policy-cards/policy-cards.component.html  |    7 -
 .../policy-cards/policy-cards.component.ts    |   12 +-
 .../policy-definition-page.module.ts          |   46 +-
 .../policy-definition-page.component.html     |    7 -
 .../transfer-history-page.module.ts           |   34 +-
 .../transfer-history-page.component.html      |    9 +-
 .../transfer-history-page.component.ts        |   12 +-
 src/app/shared.module.ts                      |   87 --
 .../asset-card-tag-list.component.html        |    0
 .../asset-card-tag-list.component.ts          |    0
 .../asset-detail-dialog-data.service.ts       |    7 -
 .../asset-detail-dialog-data.ts               |    2 +-
 .../asset-detail-dialog-result.ts             |    0
 .../asset-detail-dialog.component.html        |   22 +-
 .../asset-detail-dialog.component.scss        |    0
 .../asset-detail-dialog.component.ts          |   16 +-
 .../asset-detail-dialog.service.ts            |    0
 .../asset-property-grid-group-builder.ts      |  118 +-
 .../policy-property-field-builder.ts          |   12 +-
 .../conditions-for-use-dialog.component.html  |    0
 .../conditions-for-use-dialog.component.ts    |    0
 .../conditions-for-use-dialog.data.ts         |    0
 .../conditions-for-use-dialog.service.ts      |    0
 .../contract-offer-icon.component.ts          |    0
 .../contract-offer-mini-list.component.html   |    9 +-
 .../contract-offer-mini-list.component.ts     |    2 +-
 .../data-offer-cards.component.html           |    0
 .../data-offer-cards.component.ts             |    0
 .../edit-asset-form-required-providers.ts     |   17 +
 .../edit-asset-form.component.html            |  161 +-
 .../edit-asset-form.component.ts              |    2 +-
 .../form/asset-advanced-form-builder.ts       |    0
 .../form/asset-datasource-form-builder.ts     |    0
 .../form/asset-general-form-builder.ts        |    0
 .../form/edit-asset-form-initializer.ts       |    2 +-
 .../form/edit-asset-form-validators.ts        |    0
 .../edit-asset-form/form/edit-asset-form.ts   |    4 +-
 .../edit-asset-form}/form/http-methods.ts     |    0
 .../form/model/always-true-policy-id.ts       |    0
 .../form/model/asset-advanced-form-model.ts   |    2 +-
 .../asset-datasource-form-enabled-ctrls.ts    |    0
 .../form/model/asset-datasource-form-model.ts |    0
 .../form/model/asset-edit-dialog-mode.ts      |    0
 .../form/model/asset-general-form-model.ts    |    6 +-
 .../form/model/data-address.ts                |    0
 .../form/model/data-offer-publish-mode.ts     |    0
 .../form/model/datasource-type.ts             |    0
 .../form/model/edit-asset-form-model.ts       |    0
 .../model/http-datasource-auth-header-type.ts |    0
 .../http-datasource-header-form-model.ts      |    0
 .../http-datasource-query-param-form-model.ts |    0
 .../model/temporal-coverage-form-model.ts     |    0
 ...otiation-confirm-tos-dialog.component.html |    0
 ...otiation-confirm-tos-dialog.component.scss |    0
 ...egotiation-confirm-tos-dialog.component.ts |    0
 .../editor/expression-form-controls.ts        |    2 +-
 .../editor/expression-form-handler.ts         |   11 +-
 .../editor/expression-form-value.ts           |    0
 .../policy-form-add-menu.component.html       |    7 +-
 .../policy-form-add-menu.component.ts         |   21 +-
 ...-form-expression-constraint.component.html |    0
 ...cy-form-expression-constraint.component.ts |    2 +-
 ...olicy-form-expression-empty.component.html |    0
 .../policy-form-expression-empty.component.ts |    2 +-
 ...olicy-form-expression-multi.component.html |    0
 .../policy-form-expression-multi.component.ts |    2 +-
 .../policy-form-expression.component.html     |    0
 .../policy-form-expression.component.ts       |    2 +-
 .../policy-form-remove-button.component.html  |    0
 .../policy-form-remove-button.component.ts    |    2 +-
 .../editor/policy-form-required-providers.ts  |    7 +
 .../policy-expression-recipe.service.ts       |    4 +-
 ...timespan-restriction-dialog.component.html |    0
 .../timespan-restriction-dialog.component.ts  |    4 +-
 .../timespan-restriction-expression.ts        |    0
 .../model/policy-expression-mapped.ts         |    0
 .../model/policy-form-adapter.ts              |   41 +-
 .../model/policy-jsonld-utils.ts              |   38 +
 .../model/policy-left-expressions.ts          |    0
 .../policy-editor/model/policy-mapper.ts      |   88 ++
 .../model/policy-multi-expressions.ts         |   76 +
 .../policy-editor/model/policy-operators.ts   |  108 ++
 .../policy-editor/model/policy-verbs.ts       |   89 ++
 .../business/policy-editor/model}/tree.ts     |    0
 .../model/ui-policy-expression-utils.ts       |    0
 .../policy-expression.component.html          |    0
 .../policy-expression.component.ts            |    0
 .../policy-renderer.component.html            |    0
 .../policy-renderer.component.ts              |    0
 .../transfer-history-mini-list.component.html |    7 -
 .../transfer-history-mini-list.component.ts   |    0
 .../common}/ago/ago.component.ts              |    0
 .../common}/ago/ago.pipe.ts                   |    6 -
 .../common}/ago/date-input.ts                 |    0
 .../common}/ago/formatDateAgo.ts              |    6 -
 .../confirmation-dialog.component.html        |    7 +-
 .../confirmation-dialog.component.scss        |    0
 .../confirmation-dialog.component.ts          |   10 +-
 .../common}/date/date.component.ts            |    0
 .../empty-state/empty-state.component.html    |    0
 .../empty-state/empty-state.component.ts      |    0
 .../error-state/error-state.component.html    |    0
 .../error-state/error-state.component.ts      |    0
 .../horizontal-section-divider.component.html |    0
 .../horizontal-section-divider.component.ts   |    0
 .../common}/json-dialog/clean-json.ts         |    0
 .../json-dialog/json-dialog.component.html    |    6 +-
 .../json-dialog/json-dialog.component.ts      |    2 +-
 .../common}/json-dialog/json-dialog.data.ts   |    2 +-
 .../json-dialog/json-dialog.service.ts        |    0
 .../language-selector.component.html          |   25 +
 .../language-selector.component.ts            |   41 +
 .../loading-state.component.html              |    0
 .../loading-state/loading-state.component.ts  |    0
 .../markdown-description.component.html       |   11 +-
 .../markdown-description.component.ts         |    2 +-
 .../property-grid-group.component.html        |    2 +-
 .../property-grid-group.component.ts          |    0
 .../property-grid-group.ts                    |    0
 .../property-grid-field.service.ts            |    0
 .../property-grid/property-grid-field.ts      |    2 +-
 .../property-grid.component.html              |    0
 .../property-grid/property-grid.component.ts  |    0
 .../translate-with-slot.component.html        |    3 +
 .../translate-with-slot.component.ts          |   46 +
 ...truncated-short-description.component.html |    1 +
 .../truncated-short-description.component.ts  |    0
 .../url-list-dialog.component.html            |    6 +-
 .../url-list-dialog.component.ts              |    0
 .../url-list-dialog/url-list-dialog.data.ts   |    0
 .../url-list-dialog.service.ts                |    0
 .../data-address-type-select-item.ts          |    0
 .../data-address-type-select-items.ts         |    0
 .../data-address-type-select-mode.ts          |    0
 .../data-address-type-select.component.html   |    0
 .../data-address-type-select.component.ts     |    0
 .../data-address-type.ts                      |    0
 .../data-category-select-data.ts              |    0
 .../data-category-select-item.service.ts      |    0
 .../data-category-select-item.ts              |    0
 .../data-category-select.component.html       |    0
 .../data-category-select.component.ts         |    0
 .../data-subcategory-items.pipe.ts            |    0
 .../data-subcategory-select-data.ts           |    0
 .../data-subcategory-select-item.service.ts   |    0
 .../data-subcategory-select-item.ts           |    0
 .../data-subcategory-select.component.html    |    0
 .../data-subcategory-select.component.ts      |    0
 ...rm-data-address-type-select.component.html |    0
 ...form-data-address-type-select.component.ts |    2 +-
 .../edit-asset-form-group.component.html      |    0
 .../edit-asset-form-group.component.ts        |    0
 .../edit-asset-form-input.component.html      |    0
 .../edit-asset-form-input.component.ts        |    0
 .../edit-asset-form-label.component.html      |    0
 .../edit-asset-form-label.component.ts        |    0
 .../edit-asset-form-textarea.component.html   |    0
 .../edit-asset-form-textarea.component.ts     |    0
 .../keyword-select.component.html             |    2 +-
 .../keyword-select.component.ts               |    0
 .../language-select/language-select-data.ts   |    0
 .../language-select-item.service.ts           |    0
 .../language-select/language-select-item.ts   |    0
 .../language-select.component.html            |    4 +-
 .../language-select.component.ts              |    2 +-
 .../participant-id-select.component.html      |    0
 .../participant-id-select.component.ts        |    4 +-
 .../policy-operator-select.component.html     |    0
 .../policy-operator-select.component.ts       |    5 +-
 .../transport-mode-select-data.ts             |    0
 .../transport-mode-select-item.service.ts     |    0
 .../transport-mode-select-item.ts             |    0
 .../transport-mode-select.component.html      |    0
 .../transport-mode-select.component.ts        |    0
 .../autofocus.direcitive.ts                   |    0
 .../compare-by-field.pipe.ts                  |    0
 .../external-link.directive.ts                |    0
 .../is-active-feature.pipe.ts                 |    4 +-
 .../pipes-and-directives.module.ts            |   33 +
 .../remove-class.directive.ts                 |    0
 .../track-by-field.directive.ts               |    0
 .../pipes-and-directives}/values.pipe.ts      |    0
 src/app/shared/shared.module.ts               |  287 ++++
 src/assets/i18n/de.json                       |   76 +-
 src/assets/i18n/en.json                       |  111 +-
 src/styles.scss                               |    2 -
 328 files changed, 1972 insertions(+), 4807 deletions(-)
 create mode 100644 NOTICE
 delete mode 100644 src/app/component-library/catalog/catalog.module.ts
 delete mode 100644 src/app/component-library/catalog/truncated-short-description/truncated-short-description.component.html
 delete mode 100644 src/app/component-library/conditions-for-use-dialog/conditions-for-use-dialog.module.ts
 delete mode 100644 src/app/component-library/confirmation-dialog/confirmation-dialog.module.ts
 delete mode 100644 src/app/component-library/data-address/data-address.module.ts
 delete mode 100644 src/app/component-library/edit-asset-form/edit-asset-form.module.ts
 delete mode 100644 src/app/component-library/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.module.ts
 delete mode 100644 src/app/component-library/json-dialog/json-dialog.module.ts
 delete mode 100644 src/app/component-library/markdown-description/markdown-description.module.ts
 delete mode 100644 src/app/component-library/pipes-and-directives/pipes-and-directives.module.ts
 delete mode 100644 src/app/component-library/policy-editor/model/policy-mapper.ts
 delete mode 100644 src/app/component-library/policy-editor/model/policy-multi-expressions.ts
 delete mode 100644 src/app/component-library/policy-editor/model/policy-operators.ts
 delete mode 100644 src/app/component-library/policy-editor/model/policy-verbs.ts
 delete mode 100644 src/app/component-library/policy-editor/policy-editor.module.ts
 delete mode 100644 src/app/component-library/property-grid/property-grid.module.ts
 delete mode 100644 src/app/component-library/ui-elements/ui-elements.module.ts
 delete mode 100644 src/app/component-library/url-list-dialog/url-list-dialog.module.ts
 delete mode 100644 src/app/core/services/title-utils.service.ts
 create mode 100644 src/app/core/utils/lazy-utils.ts
 rename src/app/routes/connector-ui/{asset-page => asset-list-page}/asset-cards/asset-cards.component.html (100%)
 rename src/app/routes/connector-ui/{asset-page => asset-list-page}/asset-cards/asset-cards.component.ts (100%)
 create mode 100644 src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog-data.ts
 create mode 100644 src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog-mode.ts
 rename src/app/routes/connector-ui/{asset-page/asset-edit-dialog/asset-edit-dialog-result.ts => asset-list-page/asset-create-dialog/asset-create-dialog-result.ts} (84%)
 rename src/app/routes/connector-ui/{asset-page/asset-edit-dialog/asset-edit-dialog.component.html => asset-list-page/asset-create-dialog/asset-create-dialog.component.html} (87%)
 rename src/app/routes/connector-ui/{asset-page/asset-edit-dialog/asset-edit-dialog.component.ts => asset-list-page/asset-create-dialog/asset-create-dialog.component.ts} (65%)
 create mode 100644 src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog.service.ts
 rename src/app/routes/connector-ui/{asset-page/asset-edit-dialog => asset-list-page/asset-create-dialog}/assets-id-validator-builder.ts (100%)
 rename src/app/routes/connector-ui/{asset-page/asset-edit-dialog => asset-list-page/asset-create-dialog}/form/asset-advanced-form-builder.ts (94%)
 create mode 100644 src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/asset-create-dialog-form-mapper.ts
 rename src/app/routes/connector-ui/{asset-page/asset-edit-dialog/form/asset-edit-dialog-form.ts => asset-list-page/asset-create-dialog/form/asset-create-dialog-form.ts} (73%)
 rename src/app/routes/connector-ui/{asset-page/asset-edit-dialog => asset-list-page/asset-create-dialog}/form/asset-datasource-form-builder.ts (100%)
 rename src/app/routes/connector-ui/{asset-page/asset-edit-dialog => asset-list-page/asset-create-dialog}/form/asset-metadata-form-builder.ts (89%)
 rename src/app/{component-library/edit-asset-form/edit-asset-form => routes/connector-ui/asset-list-page/asset-create-dialog}/form/http-methods.ts (100%)
 rename src/app/routes/connector-ui/{asset-page/asset-edit-dialog => asset-list-page/asset-create-dialog}/form/model/asset-advanced-form-model.ts (67%)
 create mode 100644 src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/asset-create-dialog-form-model.ts
 rename src/app/routes/connector-ui/{asset-page/asset-edit-dialog => asset-list-page/asset-create-dialog}/form/model/asset-datasource-form-enabled-ctrls.ts (100%)
 rename src/app/routes/connector-ui/{asset-page/asset-edit-dialog => asset-list-page/asset-create-dialog}/form/model/asset-datasource-form-model.ts (87%)
 rename src/app/routes/connector-ui/{asset-page/asset-edit-dialog => asset-list-page/asset-create-dialog}/form/model/asset-metadata-form-model.ts (73%)
 rename src/app/{component-library/edit-asset-form/edit-asset-form => routes/connector-ui/asset-list-page/asset-create-dialog}/form/model/http-datasource-auth-header-type.ts (100%)
 rename src/app/routes/connector-ui/{asset-page/asset-edit-dialog => asset-list-page/asset-create-dialog}/form/model/http-datasource-header-form-model.ts (70%)
 rename src/app/routes/connector-ui/{asset-page/asset-edit-dialog => asset-list-page/asset-create-dialog}/form/model/http-datasource-query-param-form-model.ts (71%)
 rename src/app/routes/connector-ui/{asset-page/asset-edit-dialog => asset-list-page/asset-create-dialog}/form/model/temporal-coverage-form-model.ts (69%)
 create mode 100644 src/app/routes/connector-ui/asset-list-page/asset-list-page.module.ts
 rename src/app/routes/connector-ui/{asset-page/asset-page/asset-page.component.html => asset-list-page/asset-list-page/asset-list-page.component.html} (81%)
 rename src/app/routes/connector-ui/{asset-page/asset-page/asset-page.component.scss => asset-list-page/asset-list-page/asset-list-page.component.scss} (100%)
 rename src/app/routes/connector-ui/{asset-page/asset-page/asset-page.component.ts => asset-list-page/asset-list-page/asset-list-page.component.ts} (74%)
 delete mode 100644 src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog-data.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog-mode.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog.service.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/asset-edit-dialog-form-mapper.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/asset-editor-dialog-form-model.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/asset-page.module.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/data-category-select/data-category-select-data.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/data-category-select/data-category-select-item.service.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/data-category-select/data-category-select-item.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/data-category-select/data-category-select.component.html
 delete mode 100644 src/app/routes/connector-ui/asset-page/data-category-select/data-category-select.component.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-items.pipe.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-select-data.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-select-item.service.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-select-item.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-select.component.html
 delete mode 100644 src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-select.component.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/keyword-select/keyword-select.component.html
 delete mode 100644 src/app/routes/connector-ui/asset-page/keyword-select/keyword-select.component.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/language-select/language-select-data.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/language-select/language-select-item.service.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/language-select/language-select-item.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/language-select/language-select.component.html
 delete mode 100644 src/app/routes/connector-ui/asset-page/language-select/language-select.component.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/transport-mode-select/transport-mode-select-data.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/transport-mode-select/transport-mode-select-item.service.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/transport-mode-select/transport-mode-select-item.ts
 delete mode 100644 src/app/routes/connector-ui/asset-page/transport-mode-select/transport-mode-select.component.html
 delete mode 100644 src/app/routes/connector-ui/asset-page/transport-mode-select/transport-mode-select.component.ts
 delete mode 100644 src/app/routes/connector-ui/language-selector/language-selector.component.html
 delete mode 100644 src/app/routes/connector-ui/language-selector/language-selector.component.scss
 delete mode 100644 src/app/routes/connector-ui/language-selector/language-selector.component.spec.ts
 delete mode 100644 src/app/routes/connector-ui/language-selector/language-selector.component.ts
 rename src/app/{component-library/error-404-component/page-not-found.component.html => routes/connector-ui/page-not-found-page/page-not-found-page.component.html} (100%)
 rename src/app/{component-library/error-404-component/page-not-found.component.ts => routes/connector-ui/page-not-found-page/page-not-found-page.component.ts} (70%)
 create mode 100644 src/app/routes/connector-ui/page-not-found-page/page-not-found-page.module.ts
 delete mode 100644 src/app/shared.module.ts
 rename src/app/{component-library/catalog => shared/business}/asset-card-tag-list/asset-card-tag-list.component.html (100%)
 rename src/app/{component-library/catalog => shared/business}/asset-card-tag-list/asset-card-tag-list.component.ts (100%)
 rename src/app/{component-library/catalog => shared/business}/asset-detail-dialog/asset-detail-dialog-data.service.ts (93%)
 rename src/app/{component-library/catalog => shared/business}/asset-detail-dialog/asset-detail-dialog-data.ts (90%)
 rename src/app/{component-library/catalog => shared/business}/asset-detail-dialog/asset-detail-dialog-result.ts (100%)
 rename src/app/{component-library/catalog => shared/business}/asset-detail-dialog/asset-detail-dialog.component.html (92%)
 rename src/app/{component-library/catalog => shared/business}/asset-detail-dialog/asset-detail-dialog.component.scss (100%)
 rename src/app/{component-library/catalog => shared/business}/asset-detail-dialog/asset-detail-dialog.component.ts (94%)
 rename src/app/{component-library/catalog => shared/business}/asset-detail-dialog/asset-detail-dialog.service.ts (100%)
 rename src/app/{component-library/catalog => shared/business}/asset-detail-dialog/asset-property-grid-group-builder.ts (73%)
 rename src/app/{component-library/catalog => shared/business}/asset-detail-dialog/policy-property-field-builder.ts (73%)
 rename src/app/{component-library/conditions-for-use-dialog => shared/business}/conditions-for-use-dialog/conditions-for-use-dialog.component.html (100%)
 rename src/app/{component-library/conditions-for-use-dialog => shared/business}/conditions-for-use-dialog/conditions-for-use-dialog.component.ts (100%)
 rename src/app/{component-library/conditions-for-use-dialog => shared/business}/conditions-for-use-dialog/conditions-for-use-dialog.data.ts (100%)
 rename src/app/{component-library/conditions-for-use-dialog => shared/business}/conditions-for-use-dialog/conditions-for-use-dialog.service.ts (100%)
 rename src/app/{component-library/catalog => shared/business}/contract-offer-icon/contract-offer-icon.component.ts (100%)
 rename src/app/{component-library/catalog => shared/business}/contract-offer-mini-list/contract-offer-mini-list.component.html (87%)
 rename src/app/{component-library/catalog => shared/business}/contract-offer-mini-list/contract-offer-mini-list.component.ts (91%)
 rename src/app/{component-library/catalog => shared/business}/data-offer-cards/data-offer-cards.component.html (100%)
 rename src/app/{component-library/catalog => shared/business}/data-offer-cards/data-offer-cards.component.ts (100%)
 create mode 100644 src/app/shared/business/edit-asset-form/edit-asset-form-required-providers.ts
 rename src/app/{component-library/edit-asset-form => shared/business}/edit-asset-form/edit-asset-form.component.html (87%)
 rename src/app/{component-library/edit-asset-form => shared/business}/edit-asset-form/edit-asset-form.component.ts (91%)
 rename src/app/{component-library/edit-asset-form => shared/business}/edit-asset-form/form/asset-advanced-form-builder.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/business}/edit-asset-form/form/asset-datasource-form-builder.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/business}/edit-asset-form/form/asset-general-form-builder.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/business}/edit-asset-form/form/edit-asset-form-initializer.ts (97%)
 rename src/app/{component-library/edit-asset-form => shared/business}/edit-asset-form/form/edit-asset-form-validators.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/business}/edit-asset-form/form/edit-asset-form.ts (96%)
 rename src/app/{routes/connector-ui/asset-page/asset-edit-dialog => shared/business/edit-asset-form}/form/http-methods.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/business}/edit-asset-form/form/model/always-true-policy-id.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/business}/edit-asset-form/form/model/asset-advanced-form-model.ts (89%)
 rename src/app/{component-library/edit-asset-form => shared/business}/edit-asset-form/form/model/asset-datasource-form-enabled-ctrls.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/business}/edit-asset-form/form/model/asset-datasource-form-model.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/business}/edit-asset-form/form/model/asset-edit-dialog-mode.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/business}/edit-asset-form/form/model/asset-general-form-model.ts (71%)
 rename src/app/{component-library/edit-asset-form => shared/business}/edit-asset-form/form/model/data-address.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/business}/edit-asset-form/form/model/data-offer-publish-mode.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/business}/edit-asset-form/form/model/datasource-type.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/business}/edit-asset-form/form/model/edit-asset-form-model.ts (100%)
 rename src/app/{routes/connector-ui/asset-page/asset-edit-dialog => shared/business/edit-asset-form}/form/model/http-datasource-auth-header-type.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/business}/edit-asset-form/form/model/http-datasource-header-form-model.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/business}/edit-asset-form/form/model/http-datasource-query-param-form-model.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/business}/edit-asset-form/form/model/temporal-coverage-form-model.ts (100%)
 rename src/app/{component-library/initiate-negotiation-confirm-tos-dialog => shared/business}/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component.html (100%)
 rename src/app/{component-library/initiate-negotiation-confirm-tos-dialog => shared/business}/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component.scss (100%)
 rename src/app/{component-library/initiate-negotiation-confirm-tos-dialog => shared/business}/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component.ts (100%)
 rename src/app/{component-library => shared/business}/policy-editor/editor/expression-form-controls.ts (98%)
 rename src/app/{component-library => shared/business}/policy-editor/editor/expression-form-handler.ts (91%)
 rename src/app/{component-library => shared/business}/policy-editor/editor/expression-form-value.ts (100%)
 rename src/app/{component-library => shared/business}/policy-editor/editor/policy-form-add-menu/policy-form-add-menu.component.html (88%)
 rename src/app/{component-library => shared/business}/policy-editor/editor/policy-form-add-menu/policy-form-add-menu.component.ts (73%)
 rename src/app/{component-library => shared/business}/policy-editor/editor/policy-form-expression-constraint/policy-form-expression-constraint.component.html (100%)
 rename src/app/{component-library => shared/business}/policy-editor/editor/policy-form-expression-constraint/policy-form-expression-constraint.component.ts (94%)
 rename src/app/{component-library => shared/business}/policy-editor/editor/policy-form-expression-empty/policy-form-expression-empty.component.html (100%)
 rename src/app/{component-library => shared/business}/policy-editor/editor/policy-form-expression-empty/policy-form-expression-empty.component.ts (91%)
 rename src/app/{component-library => shared/business}/policy-editor/editor/policy-form-expression-multi/policy-form-expression-multi.component.html (100%)
 rename src/app/{component-library => shared/business}/policy-editor/editor/policy-form-expression-multi/policy-form-expression-multi.component.ts (93%)
 rename src/app/{component-library => shared/business}/policy-editor/editor/policy-form-expression/policy-form-expression.component.html (100%)
 rename src/app/{component-library => shared/business}/policy-editor/editor/policy-form-expression/policy-form-expression.component.ts (93%)
 rename src/app/{component-library => shared/business}/policy-editor/editor/policy-form-remove-button/policy-form-remove-button.component.html (100%)
 rename src/app/{component-library => shared/business}/policy-editor/editor/policy-form-remove-button/policy-form-remove-button.component.ts (92%)
 create mode 100644 src/app/shared/business/policy-editor/editor/policy-form-required-providers.ts
 rename src/app/{component-library => shared/business}/policy-editor/editor/recipes/policy-expression-recipe.service.ts (89%)
 rename src/app/{component-library => shared/business}/policy-editor/editor/recipes/timespan-restriction-dialog/timespan-restriction-dialog.component.html (100%)
 rename src/app/{component-library => shared/business}/policy-editor/editor/recipes/timespan-restriction-dialog/timespan-restriction-dialog.component.ts (87%)
 rename src/app/{component-library => shared/business}/policy-editor/editor/recipes/timespan-restriction-dialog/timespan-restriction-expression.ts (100%)
 rename src/app/{component-library => shared/business}/policy-editor/model/policy-expression-mapped.ts (100%)
 rename src/app/{component-library => shared/business}/policy-editor/model/policy-form-adapter.ts (74%)
 create mode 100644 src/app/shared/business/policy-editor/model/policy-jsonld-utils.ts
 rename src/app/{component-library => shared/business}/policy-editor/model/policy-left-expressions.ts (100%)
 create mode 100644 src/app/shared/business/policy-editor/model/policy-mapper.ts
 create mode 100644 src/app/shared/business/policy-editor/model/policy-multi-expressions.ts
 create mode 100644 src/app/shared/business/policy-editor/model/policy-operators.ts
 create mode 100644 src/app/shared/business/policy-editor/model/policy-verbs.ts
 rename src/app/{component-library/policy-editor/editor => shared/business/policy-editor/model}/tree.ts (100%)
 rename src/app/{component-library => shared/business}/policy-editor/model/ui-policy-expression-utils.ts (100%)
 rename src/app/{component-library => shared/business}/policy-editor/renderer/policy-expression/policy-expression.component.html (100%)
 rename src/app/{component-library => shared/business}/policy-editor/renderer/policy-expression/policy-expression.component.ts (100%)
 rename src/app/{component-library => shared/business}/policy-editor/renderer/policy-renderer/policy-renderer.component.html (100%)
 rename src/app/{component-library => shared/business}/policy-editor/renderer/policy-renderer/policy-renderer.component.ts (100%)
 rename src/app/{component-library/catalog => shared/business}/transfer-history-mini-list/transfer-history-mini-list.component.html (87%)
 rename src/app/{component-library/catalog => shared/business}/transfer-history-mini-list/transfer-history-mini-list.component.ts (100%)
 rename src/app/{component-library/ui-elements => shared/common}/ago/ago.component.ts (100%)
 rename src/app/{component-library/ui-elements => shared/common}/ago/ago.pipe.ts (76%)
 rename src/app/{component-library/ui-elements => shared/common}/ago/date-input.ts (100%)
 rename src/app/{component-library/ui-elements => shared/common}/ago/formatDateAgo.ts (71%)
 rename src/app/{component-library/confirmation-dialog => shared/common}/confirmation-dialog/confirmation-dialog.component.html (60%)
 rename src/app/{component-library/confirmation-dialog => shared/common}/confirmation-dialog/confirmation-dialog.component.scss (100%)
 rename src/app/{component-library/confirmation-dialog => shared/common}/confirmation-dialog/confirmation-dialog.component.ts (86%)
 rename src/app/{component-library/ui-elements => shared/common}/date/date.component.ts (100%)
 rename src/app/{component-library/ui-elements => shared/common}/empty-state/empty-state.component.html (100%)
 rename src/app/{component-library/ui-elements => shared/common}/empty-state/empty-state.component.ts (100%)
 rename src/app/{component-library/ui-elements => shared/common}/error-state/error-state.component.html (100%)
 rename src/app/{component-library/ui-elements => shared/common}/error-state/error-state.component.ts (100%)
 rename src/app/{component-library/ui-elements => shared/common}/horizontal-section-divider/horizontal-section-divider.component.html (100%)
 rename src/app/{component-library/ui-elements => shared/common}/horizontal-section-divider/horizontal-section-divider.component.ts (100%)
 rename src/app/{component-library/json-dialog => shared/common}/json-dialog/clean-json.ts (100%)
 rename src/app/{component-library/json-dialog => shared/common}/json-dialog/json-dialog.component.html (90%)
 rename src/app/{component-library/json-dialog => shared/common}/json-dialog/json-dialog.component.ts (94%)
 rename src/app/{component-library/json-dialog => shared/common}/json-dialog/json-dialog.data.ts (75%)
 rename src/app/{component-library/json-dialog => shared/common}/json-dialog/json-dialog.service.ts (100%)
 create mode 100644 src/app/shared/common/language-selector/language-selector.component.html
 create mode 100644 src/app/shared/common/language-selector/language-selector.component.ts
 rename src/app/{component-library/ui-elements => shared/common}/loading-state/loading-state.component.html (100%)
 rename src/app/{component-library/ui-elements => shared/common}/loading-state/loading-state.component.ts (100%)
 rename src/app/{component-library => shared/common}/markdown-description/markdown-description.component.html (78%)
 rename src/app/{component-library => shared/common}/markdown-description/markdown-description.component.ts (96%)
 rename src/app/{component-library/property-grid => shared/common}/property-grid-group/property-grid-group.component.html (89%)
 rename src/app/{component-library/property-grid => shared/common}/property-grid-group/property-grid-group.component.ts (100%)
 rename src/app/{component-library/property-grid => shared/common}/property-grid-group/property-grid-group.ts (100%)
 rename src/app/{component-library/property-grid => shared/common}/property-grid/property-grid-field.service.ts (100%)
 rename src/app/{component-library/property-grid => shared/common}/property-grid/property-grid-field.ts (88%)
 rename src/app/{component-library/property-grid => shared/common}/property-grid/property-grid.component.html (100%)
 rename src/app/{component-library/property-grid => shared/common}/property-grid/property-grid.component.ts (100%)
 create mode 100644 src/app/shared/common/translate-with-slot/translate-with-slot.component.html
 create mode 100644 src/app/shared/common/translate-with-slot/translate-with-slot.component.ts
 create mode 100644 src/app/shared/common/truncated-short-description/truncated-short-description.component.html
 rename src/app/{component-library/catalog => shared/common}/truncated-short-description/truncated-short-description.component.ts (100%)
 rename src/app/{component-library/url-list-dialog => shared/common}/url-list-dialog/url-list-dialog.component.html (84%)
 rename src/app/{component-library/url-list-dialog => shared/common}/url-list-dialog/url-list-dialog.component.ts (100%)
 rename src/app/{component-library/url-list-dialog => shared/common}/url-list-dialog/url-list-dialog.data.ts (100%)
 rename src/app/{component-library/url-list-dialog => shared/common}/url-list-dialog/url-list-dialog.service.ts (100%)
 rename src/app/{component-library/data-address => shared/form-elements}/data-address-type-select/data-address-type-select-item.ts (100%)
 rename src/app/{component-library/data-address => shared/form-elements}/data-address-type-select/data-address-type-select-items.ts (100%)
 rename src/app/{component-library/data-address => shared/form-elements}/data-address-type-select/data-address-type-select-mode.ts (100%)
 rename src/app/{component-library/data-address => shared/form-elements}/data-address-type-select/data-address-type-select.component.html (100%)
 rename src/app/{component-library/data-address => shared/form-elements}/data-address-type-select/data-address-type-select.component.ts (100%)
 rename src/app/{component-library/data-address => shared/form-elements}/data-address-type-select/data-address-type.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/data-category-select/data-category-select-data.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/data-category-select/data-category-select-item.service.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/data-category-select/data-category-select-item.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/data-category-select/data-category-select.component.html (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/data-category-select/data-category-select.component.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/data-subcategory-select/data-subcategory-items.pipe.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/data-subcategory-select/data-subcategory-select-data.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/data-subcategory-select/data-subcategory-select-item.service.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/data-subcategory-select/data-subcategory-select-item.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/data-subcategory-select/data-subcategory-select.component.html (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/data-subcategory-select/data-subcategory-select.component.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/edit-asset-form-data-address-type-select/edit-asset-form-data-address-type-select.component.html (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/edit-asset-form-data-address-type-select/edit-asset-form-data-address-type-select.component.ts (85%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/edit-asset-form-group/edit-asset-form-group.component.html (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/edit-asset-form-group/edit-asset-form-group.component.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/edit-asset-form-input/edit-asset-form-input.component.html (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/edit-asset-form-input/edit-asset-form-input.component.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/edit-asset-form-label/edit-asset-form-label.component.html (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/edit-asset-form-label/edit-asset-form-label.component.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/edit-asset-form-textarea/edit-asset-form-textarea.component.html (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/edit-asset-form-textarea/edit-asset-form-textarea.component.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/keyword-select/keyword-select.component.html (93%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/keyword-select/keyword-select.component.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/language-select/language-select-data.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/language-select/language-select-item.service.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/language-select/language-select-item.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/language-select/language-select.component.html (82%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/language-select/language-select.component.ts (94%)
 rename src/app/{component-library/policy-editor/editor/controls => shared/form-elements}/participant-id-select/participant-id-select.component.html (100%)
 rename src/app/{component-library/policy-editor/editor/controls => shared/form-elements}/participant-id-select/participant-id-select.component.ts (86%)
 rename src/app/{component-library/policy-editor/editor => shared/form-elements}/policy-operator-select/policy-operator-select.component.html (100%)
 rename src/app/{component-library/policy-editor/editor => shared/form-elements}/policy-operator-select/policy-operator-select.component.ts (87%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/transport-mode-select/transport-mode-select-data.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/transport-mode-select/transport-mode-select-item.service.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/transport-mode-select/transport-mode-select-item.ts (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/transport-mode-select/transport-mode-select.component.html (100%)
 rename src/app/{component-library/edit-asset-form => shared/form-elements}/transport-mode-select/transport-mode-select.component.ts (100%)
 rename src/app/{component-library/pipes-and-directives/directives => shared/pipes-and-directives}/autofocus.direcitive.ts (100%)
 rename src/app/{component-library/pipes-and-directives/pipes => shared/pipes-and-directives}/compare-by-field.pipe.ts (100%)
 rename src/app/{component-library/pipes-and-directives/directives => shared/pipes-and-directives}/external-link.directive.ts (100%)
 rename src/app/{component-library/pipes-and-directives/pipes => shared/pipes-and-directives}/is-active-feature.pipe.ts (71%)
 create mode 100644 src/app/shared/pipes-and-directives/pipes-and-directives.module.ts
 rename src/app/{component-library/pipes-and-directives/directives => shared/pipes-and-directives}/remove-class.directive.ts (100%)
 rename src/app/{component-library/pipes-and-directives/directives => shared/pipes-and-directives}/track-by-field.directive.ts (100%)
 rename src/app/{component-library/pipes-and-directives/pipes => shared/pipes-and-directives}/values.pipe.ts (100%)
 create mode 100644 src/app/shared/shared.module.ts

diff --git a/NOTICE b/NOTICE
new file mode 100644
index 000000000..11716f93b
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,11 @@
+sovity EDC UI
+Copyright (c) 2024. sovity GmbH
+
+This product includes software developed at sovity GmbH (https://www.sovity.de).
+Copyright (c) 2024. sovity GmbH
+
+The initial internationalization of the EDC UI and localization to German was done
+by the Fraunhofer Institute for Applied Information Technology FIT (https://www.fit.fraunhofer.de/).
+This project was part of the national flagship project "Datenraum Kultur" and was funded
+by the Federal Government Commissioner for Culture and the Media from 2023 to 2025.
+Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 4582103ee..87c2d65f6 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,7 +1,7 @@
 import {NgModule} from '@angular/core';
 import {ROUTES, RouterModule, Routes} from '@angular/router';
-import {PageNotFoundComponent} from './component-library/error-404-component/page-not-found.component';
 import {APP_CONFIG, AppConfig} from './core/config/app-config';
+import {PageNotFoundPageComponent} from './routes/connector-ui/page-not-found-page/page-not-found-page.component';
 
 @NgModule({
   imports: [RouterModule.forRoot([], {paramsInheritanceStrategy: 'always'})],
@@ -27,7 +27,7 @@ import {APP_CONFIG, AppConfig} from './core/config/app-config';
           default:
             throw new Error(`Unhandled PageSet: ${config.routes}`);
         }
-        routes.push({path: '**', component: PageNotFoundComponent});
+        routes.push({path: '**', component: PageNotFoundPageComponent});
         return routes;
       },
     },
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 7c92fe1c0..c166dc256 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,15 +1,22 @@
-import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http';
+import {
+  HTTP_INTERCEPTORS,
+  HttpClient,
+  HttpClientModule,
+} from '@angular/common/http';
 import {NgModule} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
+import {TitleStrategy} from '@angular/router';
+import {TranslateLoader, TranslateModule} from '@ngx-translate/core';
+import {TranslateHttpLoader} from '@ngx-translate/http-loader';
 import {NgxsModule} from '@ngxs/store';
 import {NgChartsModule} from 'ng2-charts';
 import {AppRoutingModule} from './app-routing.module';
 import {AppComponent} from './app.component';
-import {PageNotFoundComponent} from './component-library/error-404-component/page-not-found.component';
 import {provideAppConfig} from './core/config/app-config-initializer';
 import {ApiKeyInterceptor} from './core/services/api/api-key.interceptor';
-import {SharedModule} from './shared.module';
+import {CustomPageTitleStrategy} from './core/services/page-title-strategy';
+import {SharedModule} from './shared/shared.module';
 
 @NgModule({
   imports: [
@@ -18,7 +25,14 @@ import {SharedModule} from './shared.module';
     BrowserModule,
     HttpClientModule,
 
-    SharedModule,
+    //Translation
+    TranslateModule.forRoot({
+      loader: {
+        provide: TranslateLoader,
+        useFactory: (http: HttpClient) => new TranslateHttpLoader(http),
+        deps: [HttpClient],
+      },
+    }),
 
     // NgXs
     NgxsModule.forRoot([]),
@@ -26,15 +40,21 @@ import {SharedModule} from './shared.module';
     // Third Party
     NgChartsModule.forRoot(),
 
+    // Features
+    SharedModule,
+
     // Routing
     AppRoutingModule,
   ],
-  declarations: [AppComponent, PageNotFoundComponent],
+  declarations: [AppComponent],
   providers: [
+    HttpClient,
     provideAppConfig(),
 
     {provide: HTTP_INTERCEPTORS, multi: true, useClass: ApiKeyInterceptor},
+    {provide: TitleStrategy, useClass: CustomPageTitleStrategy},
   ],
   bootstrap: [AppComponent],
+  exports: [TranslateModule],
 })
 export class AppModule {}
diff --git a/src/app/component-library/catalog/catalog.module.ts b/src/app/component-library/catalog/catalog.module.ts
deleted file mode 100644
index aa501591f..000000000
--- a/src/app/component-library/catalog/catalog.module.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {MatButtonModule} from '@angular/material/button';
-import {MatCardModule} from '@angular/material/card';
-import {MatChipsModule} from '@angular/material/chips';
-import {MatDialogModule} from '@angular/material/dialog';
-import {MatIconModule} from '@angular/material/icon';
-import {MatProgressBarModule} from '@angular/material/progress-bar';
-import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
-import {MatTooltipModule} from '@angular/material/tooltip';
-import {ConditionsForUseDialogModule} from '../conditions-for-use-dialog/conditions-for-use-dialog.module';
-import {InitiateNegotiationConfirmTosDialogModule} from '../initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.module';
-import {JsonDialogModule} from '../json-dialog/json-dialog.module';
-import {MarkdownDescriptionModule} from '../markdown-description/markdown-description.module';
-import {PipesAndDirectivesModule} from '../pipes-and-directives/pipes-and-directives.module';
-import {PropertyGridModule} from '../property-grid/property-grid.module';
-import {UiElementsModule} from '../ui-elements/ui-elements.module';
-import {UrlListDialogModule} from '../url-list-dialog/url-list-dialog.module';
-import {AssetCardTagListComponent} from './asset-card-tag-list/asset-card-tag-list.component';
-import {AssetDetailDialogDataService} from './asset-detail-dialog/asset-detail-dialog-data.service';
-import {AssetDetailDialogComponent} from './asset-detail-dialog/asset-detail-dialog.component';
-import {AssetDetailDialogService} from './asset-detail-dialog/asset-detail-dialog.service';
-import {AssetPropertyGridGroupBuilder} from './asset-detail-dialog/asset-property-grid-group-builder';
-import {PolicyPropertyFieldBuilder} from './asset-detail-dialog/policy-property-field-builder';
-import {ContractOfferIconComponent} from './contract-offer-icon/contract-offer-icon.component';
-import {ContractOfferMiniListComponent} from './contract-offer-mini-list/contract-offer-mini-list.component';
-import {DataOfferCardsComponent} from './data-offer-cards/data-offer-cards.component';
-import {TransferHistoryMiniListComponent} from './transfer-history-mini-list/transfer-history-mini-list.component';
-import {TruncatedShortDescription} from './truncated-short-description/truncated-short-description.component';
-
-@NgModule({
-  imports: [
-    // Angular
-    CommonModule,
-
-    // Angular Material
-    MatButtonModule,
-    MatCardModule,
-    MatChipsModule,
-    MatIconModule,
-    MatProgressBarModule,
-    MatProgressSpinnerModule,
-    MatDialogModule,
-    MatTooltipModule,
-    MatIconModule,
-    MatChipsModule,
-
-    // Features
-    JsonDialogModule,
-    UrlListDialogModule,
-    ConditionsForUseDialogModule,
-    PropertyGridModule,
-    UiElementsModule,
-    PipesAndDirectivesModule,
-    MarkdownDescriptionModule,
-
-    InitiateNegotiationConfirmTosDialogModule,
-  ],
-  declarations: [
-    AssetDetailDialogComponent,
-    ContractOfferIconComponent,
-    ContractOfferMiniListComponent,
-    DataOfferCardsComponent,
-    TransferHistoryMiniListComponent,
-    TruncatedShortDescription,
-    AssetCardTagListComponent,
-  ],
-  exports: [
-    AssetDetailDialogComponent,
-    ContractOfferIconComponent,
-    ContractOfferMiniListComponent,
-    DataOfferCardsComponent,
-    TransferHistoryMiniListComponent,
-    TruncatedShortDescription,
-    AssetCardTagListComponent,
-  ],
-  providers: [
-    AssetPropertyGridGroupBuilder,
-    AssetDetailDialogDataService,
-    AssetDetailDialogService,
-    PolicyPropertyFieldBuilder,
-  ],
-})
-export class CatalogModule {}
diff --git a/src/app/component-library/catalog/truncated-short-description/truncated-short-description.component.html b/src/app/component-library/catalog/truncated-short-description/truncated-short-description.component.html
deleted file mode 100644
index dc231a44e..000000000
--- a/src/app/component-library/catalog/truncated-short-description/truncated-short-description.component.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{{ text || ('component_library.no_description' | translate) }}
-<!--
-  ~ Copyright (c) 2021-2024. sovity GmbH
-  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
-  ~ Contributors:
-  ~    - Fraunhofer FIT: Internationalization and German Localization
-  -->
-
-<!--{{ text || 'No description.' }}-->
diff --git a/src/app/component-library/conditions-for-use-dialog/conditions-for-use-dialog.module.ts b/src/app/component-library/conditions-for-use-dialog/conditions-for-use-dialog.module.ts
deleted file mode 100644
index c6fb402ac..000000000
--- a/src/app/component-library/conditions-for-use-dialog/conditions-for-use-dialog.module.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {FormsModule} from '@angular/forms';
-import {MatButtonModule} from '@angular/material/button';
-import {MatCardModule} from '@angular/material/card';
-import {MatDialogModule} from '@angular/material/dialog';
-import {MatIconModule} from '@angular/material/icon';
-import {NgxJsonViewerModule} from 'ngx-json-viewer';
-import {ConfirmationDialogModule} from '../confirmation-dialog/confirmation-dialog.module';
-import {MarkdownDescriptionModule} from '../markdown-description/markdown-description.module';
-import {PipesAndDirectivesModule} from '../pipes-and-directives/pipes-and-directives.module';
-import {ConditionsForUseDialogComponent} from './conditions-for-use-dialog/conditions-for-use-dialog.component';
-import {ConditionsForUseDialogService} from './conditions-for-use-dialog/conditions-for-use-dialog.service';
-
-@NgModule({
-  imports: [
-    // Angular
-    CommonModule,
-    FormsModule,
-
-    // Angular Material
-    MatButtonModule,
-    MatCardModule,
-    MatDialogModule,
-    MatIconModule,
-
-    // Third Party
-    NgxJsonViewerModule,
-
-    // EDC UI Modules
-    PipesAndDirectivesModule,
-    ConfirmationDialogModule,
-    MarkdownDescriptionModule,
-  ],
-  declarations: [ConditionsForUseDialogComponent],
-  providers: [ConditionsForUseDialogService],
-  exports: [ConditionsForUseDialogComponent],
-})
-export class ConditionsForUseDialogModule {}
diff --git a/src/app/component-library/confirmation-dialog/confirmation-dialog.module.ts b/src/app/component-library/confirmation-dialog/confirmation-dialog.module.ts
deleted file mode 100644
index 9ab95bded..000000000
--- a/src/app/component-library/confirmation-dialog/confirmation-dialog.module.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
-import {ClipboardModule} from '@angular/cdk/clipboard';
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {MatButtonModule} from '@angular/material/button';
-import {MatCheckboxModule} from '@angular/material/checkbox';
-import {MatDialogModule} from '@angular/material/dialog';
-import {MatIconModule} from '@angular/material/icon';
-import {MatTooltipModule} from '@angular/material/tooltip';
-import {TranslateModule} from '@ngx-translate/core';
-import {PipesAndDirectivesModule} from '../pipes-and-directives/pipes-and-directives.module';
-import {ConfirmationDialogComponent} from './confirmation-dialog/confirmation-dialog.component';
-
-@NgModule({
-  imports: [
-    // Angular
-    CommonModule,
-    TranslateModule,
-    // Angular CDK
-    ClipboardModule,
-
-    // Angular Material
-    MatButtonModule,
-    MatCheckboxModule,
-    MatDialogModule,
-    MatIconModule,
-    MatTooltipModule,
-
-    // EDC UI Feature Modules
-    PipesAndDirectivesModule,
-  ],
-  declarations: [ConfirmationDialogComponent],
-  exports: [ConfirmationDialogComponent],
-})
-export class ConfirmationDialogModule {}
diff --git a/src/app/component-library/data-address/data-address.module.ts b/src/app/component-library/data-address/data-address.module.ts
deleted file mode 100644
index 0003fa584..000000000
--- a/src/app/component-library/data-address/data-address.module.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {ReactiveFormsModule} from '@angular/forms';
-import {MatInputModule} from '@angular/material/input';
-import {MatSelectModule} from '@angular/material/select';
-import {DataAddressTypeSelectComponent} from './data-address-type-select/data-address-type-select.component';
-
-@NgModule({
-  imports: [
-    // Angular
-    CommonModule,
-    ReactiveFormsModule,
-
-    // Angular Material
-    MatInputModule,
-    MatSelectModule,
-  ],
-  declarations: [DataAddressTypeSelectComponent],
-  exports: [DataAddressTypeSelectComponent],
-})
-export class DataAddressModule {}
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form.module.ts b/src/app/component-library/edit-asset-form/edit-asset-form.module.ts
deleted file mode 100644
index 636a0f879..000000000
--- a/src/app/component-library/edit-asset-form/edit-asset-form.module.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {MatBadgeModule} from '@angular/material/badge';
-import {MatButtonModule} from '@angular/material/button';
-import {MatCardModule} from '@angular/material/card';
-import {MatCheckboxModule} from '@angular/material/checkbox';
-import {MatChipsModule} from '@angular/material/chips';
-import {MatNativeDateModule} from '@angular/material/core';
-import {MatDatepickerModule} from '@angular/material/datepicker';
-import {MatDialogModule} from '@angular/material/dialog';
-import {MatDividerModule} from '@angular/material/divider';
-import {MatFormFieldModule} from '@angular/material/form-field';
-import {MatIconModule} from '@angular/material/icon';
-import {MatInputModule} from '@angular/material/input';
-import {MatPaginatorModule} from '@angular/material/paginator';
-import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
-import {MatRadioModule} from '@angular/material/radio';
-import {MatSelectModule} from '@angular/material/select';
-import {MatSlideToggleModule} from '@angular/material/slide-toggle';
-import {MatStepperModule} from '@angular/material/stepper';
-import {MatTooltipModule} from '@angular/material/tooltip';
-import {RouterModule} from '@angular/router';
-import {CatalogModule} from '../catalog/catalog.module';
-import {PipesAndDirectivesModule} from '../pipes-and-directives/pipes-and-directives.module';
-import {PolicyEditorModule} from '../policy-editor/policy-editor.module';
-import {UiElementsModule} from '../ui-elements/ui-elements.module';
-import {DataCategorySelectComponent} from './data-category-select/data-category-select.component';
-import {DataSubcategoryItemsPipe} from './data-subcategory-select/data-subcategory-items.pipe';
-import {DataSubcategorySelectComponent} from './data-subcategory-select/data-subcategory-select.component';
-import {EditAssetFormDataAddressTypeSelectComponent} from './edit-asset-form-data-address-type-select/edit-asset-form-data-address-type-select.component';
-import {EditAssetFormGroupComponent} from './edit-asset-form-group/edit-asset-form-group.component';
-import {EditAssetFormInputComponent} from './edit-asset-form-input/edit-asset-form-input.component';
-import {EditAssetFormLabelComponent} from './edit-asset-form-label/edit-asset-form-label.component';
-import {EditAssetFormTextareaComponent} from './edit-asset-form-textarea/edit-asset-form-textarea.component';
-import {EditAssetFormComponent} from './edit-asset-form/edit-asset-form.component';
-import {KeywordSelectComponent} from './keyword-select/keyword-select.component';
-import {LanguageSelectComponent} from './language-select/language-select.component';
-import {TransportModeSelectComponent} from './transport-mode-select/transport-mode-select.component';
-import {TranslateModule} from '@ngx-translate/core';
-
-
-@NgModule({
-  imports: [
-    // Angular
-    CommonModule,
-    FormsModule,
-    ReactiveFormsModule,
-    RouterModule,
-	TranslateModule,
-
-    // Angular Material
-    MatBadgeModule,
-    MatButtonModule,
-    MatCardModule,
-    MatCheckboxModule,
-    MatChipsModule,
-    MatDatepickerModule,
-    MatDividerModule,
-    MatFormFieldModule,
-    MatProgressSpinnerModule,
-    MatSelectModule,
-    MatSlideToggleModule,
-    MatStepperModule,
-    MatTooltipModule,
-    MatPaginatorModule,
-    MatInputModule,
-    MatRadioModule,
-    MatIconModule,
-    MatDialogModule,
-    MatNativeDateModule,
-
-    // EDC UI Modules
-    CatalogModule,
-    PipesAndDirectivesModule,
-    PolicyEditorModule,
-    UiElementsModule,
-  ],
-  declarations: [
-    EditAssetFormComponent,
-    EditAssetFormGroupComponent,
-    EditAssetFormLabelComponent,
-    EditAssetFormInputComponent,
-    EditAssetFormTextareaComponent,
-    KeywordSelectComponent,
-    DataCategorySelectComponent,
-    DataSubcategorySelectComponent,
-    DataSubcategoryItemsPipe,
-    EditAssetFormDataAddressTypeSelectComponent,
-    TransportModeSelectComponent,
-    LanguageSelectComponent,
-  ],
-  exports: [EditAssetFormComponent, EditAssetFormLabelComponent],
-  providers: [],
-})
-export class EditAssetFormModule {}
diff --git a/src/app/component-library/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.module.ts b/src/app/component-library/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.module.ts
deleted file mode 100644
index 7134bafc8..000000000
--- a/src/app/component-library/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.module.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import {ClipboardModule} from '@angular/cdk/clipboard';
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {MatButtonModule} from '@angular/material/button';
-import {MatCheckboxModule} from '@angular/material/checkbox';
-import {MatDialogModule} from '@angular/material/dialog';
-import {MatIconModule} from '@angular/material/icon';
-import {MatTooltipModule} from '@angular/material/tooltip';
-import {TranslateModule} from '@ngx-translate/core';
-import {PipesAndDirectivesModule} from '../pipes-and-directives/pipes-and-directives.module';
-import {InitiateNegotiationConfirmTosDialogComponent} from './initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component';
-
-@NgModule({
-  imports: [
-    // Angular
-    CommonModule,
-    TranslateModule,
-    // Angular CDK
-    ClipboardModule,
-
-    // Angular Material
-    MatButtonModule,
-    MatCheckboxModule,
-    MatDialogModule,
-    MatIconModule,
-    MatTooltipModule,
-
-    // EDC UI Feature Modules
-    PipesAndDirectivesModule,
-  ],
-  declarations: [InitiateNegotiationConfirmTosDialogComponent],
-  exports: [InitiateNegotiationConfirmTosDialogComponent],
-})
-export class InitiateNegotiationConfirmTosDialogModule {}
diff --git a/src/app/component-library/json-dialog/json-dialog.module.ts b/src/app/component-library/json-dialog/json-dialog.module.ts
deleted file mode 100644
index add14049a..000000000
--- a/src/app/component-library/json-dialog/json-dialog.module.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {FormsModule} from '@angular/forms';
-import {MatButtonModule} from '@angular/material/button';
-import {MatCardModule} from '@angular/material/card';
-import {MatCheckboxModule} from '@angular/material/checkbox';
-import {MatDialogModule} from '@angular/material/dialog';
-import {MatIconModule} from '@angular/material/icon';
-import {MatTooltipModule} from '@angular/material/tooltip';
-import {TranslateModule} from '@ngx-translate/core';
-import {NgxJsonViewerModule} from 'ngx-json-viewer';
-import {ConfirmationDialogModule} from '../confirmation-dialog/confirmation-dialog.module';
-import {PipesAndDirectivesModule} from '../pipes-and-directives/pipes-and-directives.module';
-import {JsonDialogComponent} from './json-dialog/json-dialog.component';
-import {JsonDialogService} from './json-dialog/json-dialog.service';
-
-@NgModule({
-  imports: [
-    // Angular
-    CommonModule,
-    FormsModule,
-    TranslateModule,
-    // Angular Material
-    MatButtonModule,
-    MatCardModule,
-    MatCheckboxModule,
-    MatDialogModule,
-    MatIconModule,
-    MatTooltipModule,
-
-    // Third Party
-    NgxJsonViewerModule,
-
-    // EDC UI Modules
-    PipesAndDirectivesModule,
-    ConfirmationDialogModule,
-  ],
-  declarations: [JsonDialogComponent],
-  providers: [JsonDialogService],
-  exports: [JsonDialogComponent],
-})
-export class JsonDialogModule {}
diff --git a/src/app/component-library/markdown-description/markdown-description.module.ts b/src/app/component-library/markdown-description/markdown-description.module.ts
deleted file mode 100644
index fc6eb5728..000000000
--- a/src/app/component-library/markdown-description/markdown-description.module.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {FormsModule} from '@angular/forms';
-import {MatButtonModule} from '@angular/material/button';
-import {MatCardModule} from '@angular/material/card';
-import {MatCheckboxModule} from '@angular/material/checkbox';
-import {MatDialogModule} from '@angular/material/dialog';
-import {MatIconModule} from '@angular/material/icon';
-import {MatTooltipModule} from '@angular/material/tooltip';
-import {NgxJsonViewerModule} from 'ngx-json-viewer';
-import {ConfirmationDialogModule} from '../confirmation-dialog/confirmation-dialog.module';
-import {PipesAndDirectivesModule} from '../pipes-and-directives/pipes-and-directives.module';
-import {MarkdownDescriptionComponent} from './markdown-description.component';
-
-@NgModule({
-  imports: [
-    // Angular
-    CommonModule,
-    FormsModule,
-
-    // Angular Material
-    MatButtonModule,
-    MatCardModule,
-    MatCheckboxModule,
-    MatDialogModule,
-    MatIconModule,
-    MatTooltipModule,
-
-    // Third Party
-    NgxJsonViewerModule,
-
-    // EDC UI Modules
-    PipesAndDirectivesModule,
-    ConfirmationDialogModule,
-  ],
-  declarations: [MarkdownDescriptionComponent],
-  providers: [],
-  exports: [MarkdownDescriptionComponent],
-})
-export class MarkdownDescriptionModule {}
diff --git a/src/app/component-library/pipes-and-directives/pipes-and-directives.module.ts b/src/app/component-library/pipes-and-directives/pipes-and-directives.module.ts
deleted file mode 100644
index 1af7a09de..000000000
--- a/src/app/component-library/pipes-and-directives/pipes-and-directives.module.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {MatIconModule} from '@angular/material/icon';
-import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
-import {AutofocusDirective} from './directives/autofocus.direcitive';
-import {ExternalLinkDirective} from './directives/external-link.directive';
-import {RemoveClassDirective} from './directives/remove-class.directive';
-import {TrackByFieldDirective} from './directives/track-by-field.directive';
-import {CompareByFieldPipe} from './pipes/compare-by-field.pipe';
-import {IsActiveFeaturePipe} from './pipes/is-active-feature.pipe';
-import {ValuesPipe} from './pipes/values.pipe';
-
-@NgModule({
-  imports: [
-    // Angular
-    CommonModule,
-
-    // Angular Material
-    MatIconModule,
-    MatProgressSpinnerModule,
-  ],
-  declarations: [
-    AutofocusDirective,
-    CompareByFieldPipe,
-    ExternalLinkDirective,
-    IsActiveFeaturePipe,
-    RemoveClassDirective,
-    TrackByFieldDirective,
-    ValuesPipe,
-  ],
-  exports: [
-    AutofocusDirective,
-    CompareByFieldPipe,
-    ExternalLinkDirective,
-    IsActiveFeaturePipe,
-    RemoveClassDirective,
-    TrackByFieldDirective,
-    ValuesPipe,
-  ],
-})
-export class PipesAndDirectivesModule {}
diff --git a/src/app/component-library/policy-editor/model/policy-mapper.ts b/src/app/component-library/policy-editor/model/policy-mapper.ts
deleted file mode 100644
index 173ba4e78..000000000
--- a/src/app/component-library/policy-editor/model/policy-mapper.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import {Injectable} from '@angular/core';
-import {
-  OperatorDto,
-  UiPolicyExpression,
-  UiPolicyExpressionType,
-  UiPolicyLiteral,
-} from '@sovity.de/edc-client';
-import {associateBy} from '../../../core/utils/map-utils';
-import {PolicyExpressionMapped} from './policy-expression-mapped';
-import {
-  PolicyMultiExpressionConfig,
-  SUPPORTED_MULTI_EXPRESSIONS,
-} from './policy-multi-expressions';
-import {
-  PolicyOperatorConfig,
-  SUPPORTED_POLICY_OPERATORS,
-  defaultPolicyOperatorConfig,
-} from './policy-operators';
-import {
-  PolicyVerbConfig,
-  SUPPORTED_POLICY_VERBS,
-  defaultPolicyVerbConfig,
-} from './policy-verbs';
-
-@Injectable({providedIn: 'root'})
-export class PolicyMapper {
-  verbs = associateBy(SUPPORTED_POLICY_VERBS, (it) => it.operandLeftId);
-  operators = associateBy(SUPPORTED_POLICY_OPERATORS, (it) => it.id);
-  multiExpressionTypes = associateBy(
-    SUPPORTED_MULTI_EXPRESSIONS,
-    (it) => it.expressionType,
-  );
-
-  buildPolicy(expression: UiPolicyExpression): PolicyExpressionMapped {
-    if (expression.type === 'EMPTY') {
-      return {type: 'EMPTY'};
-    }
-
-    if (expression.type === 'CONSTRAINT') {
-      return this.mapConstraint(expression);
-    }
-
-    return this.mapMultiExpression(expression);
-  }
-
-  private mapConstraint(
-    expression: UiPolicyExpression,
-  ): PolicyExpressionMapped {
-    const verb = this.getVerbConfig(expression.constraint?.left!);
-    const operator = this.getOperatorConfig(expression.constraint?.operator!);
-    const value = expression.constraint?.right;
-
-    return {
-      type: 'CONSTRAINT',
-      verb,
-      operator,
-      valueRaw: value,
-      valueJson: this.formatJson(value!),
-      displayValue: this.formatValue(value, verb) ?? 'null',
-    };
-  }
-
-  private mapMultiExpression(
-    expression: UiPolicyExpression,
-  ): PolicyExpressionMapped {
-    const multiExpression = this.getMultiExpressionConfig(expression.type);
-    const expressions = (expression.expressions ?? []).map((it) =>
-      this.buildPolicy(it),
-    );
-    return {
-      type: 'MULTI',
-      multiExpression,
-      expressions,
-    };
-  }
-
-  private getVerbConfig(verb: string): PolicyVerbConfig {
-    const verbConfig = this.verbs.get(verb);
-    if (verbConfig) {
-      return verbConfig;
-    }
-
-    return defaultPolicyVerbConfig(verb);
-  }
-
-  private getOperatorConfig(operator: OperatorDto): PolicyOperatorConfig {
-    const operatorConfig = this.operators.get(operator);
-    if (operatorConfig) {
-      return operatorConfig;
-    }
-
-    return defaultPolicyOperatorConfig(operator);
-  }
-
-  private getMultiExpressionConfig(
-    expressionType: UiPolicyExpressionType,
-  ): PolicyMultiExpressionConfig {
-    const multiExpressionType = this.multiExpressionTypes.get(expressionType);
-    if (multiExpressionType) {
-      return multiExpressionType;
-    }
-
-    return {
-      expressionType,
-      title: expressionType,
-      description: '',
-    };
-  }
-
-  private formatValue(
-    value: UiPolicyLiteral | undefined,
-    verbConfig: PolicyVerbConfig,
-  ) {
-    if (value == null) {
-      return '';
-    }
-
-    return verbConfig.adapter.displayText(value);
-  }
-
-  private formatJson(value: UiPolicyLiteral): string {
-    if (value.type === 'STRING_LIST') {
-      return JSON.stringify(value.valueList);
-    }
-
-    if (value.type === 'JSON') {
-      return value.value ?? '';
-    }
-
-    return JSON.stringify(value.value);
-  }
-}
diff --git a/src/app/component-library/policy-editor/model/policy-multi-expressions.ts b/src/app/component-library/policy-editor/model/policy-multi-expressions.ts
deleted file mode 100644
index 427b29cf2..000000000
--- a/src/app/component-library/policy-editor/model/policy-multi-expressions.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import {UiPolicyExpressionType} from '@sovity.de/edc-client';
-
-export interface PolicyMultiExpressionConfig {
-  expressionType: UiPolicyExpressionType;
-  title: string;
-  description: string;
-}
-
-export const SUPPORTED_MULTI_EXPRESSIONS: PolicyMultiExpressionConfig[] = [
-  {
-    expressionType: 'AND',
-    title: 'AND',
-    description:
-      'Conjunction of several expressions. Evaluates to true if and only if all child expressions are true',
-  },
-  {
-    expressionType: 'OR',
-    title: 'OR',
-    description:
-      'Disjunction of several expressions. Evaluates to true if and only if at least one child expression is true',
-  },
-  {
-    expressionType: 'XONE',
-    title: 'XONE',
-    description:
-      'XONE operation. Evaluates to true if and only if exactly one child expression is true',
-  },
-];
diff --git a/src/app/component-library/policy-editor/model/policy-operators.ts b/src/app/component-library/policy-editor/model/policy-operators.ts
deleted file mode 100644
index 8d76a5ba4..000000000
--- a/src/app/component-library/policy-editor/model/policy-operators.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import {OperatorDto} from '@sovity.de/edc-client';
-
-export interface PolicyOperatorConfig {
-  id: OperatorDto;
-  title: string;
-  description: string;
-}
-
-export const SUPPORTED_POLICY_OPERATORS: PolicyOperatorConfig[] = [
-  {
-    id: 'EQ',
-    title: '=',
-    description: 'Equal to',
-  },
-  {
-    id: 'NEQ',
-    title: '≠',
-    description: 'Not equal to',
-  },
-  {
-    id: 'GEQ',
-    title: '≥',
-    description: 'Greater than or equal to',
-  },
-  {
-    id: 'GT',
-    title: '>',
-    description: 'Greater than',
-  },
-  {
-    id: 'LEQ',
-    title: '≤',
-    description: 'Less than or equal to',
-  },
-  {
-    id: 'LT',
-    title: '<',
-    description: 'Less than',
-  },
-  {
-    id: 'IN',
-    title: 'IN',
-    description: 'In',
-  },
-  {
-    id: 'HAS_PART',
-    title: 'HAS PART',
-    description: 'Has Part',
-  },
-  {
-    id: 'IS_A',
-    title: 'IS A',
-    description: 'Is a',
-  },
-  {
-    id: 'IS_NONE_OF',
-    title: 'IS NONE OF',
-    description: 'Is none of',
-  },
-  {
-    id: 'IS_ANY_OF',
-    title: 'IS ANY OF',
-    description: 'Is any of',
-  },
-  {
-    id: 'IS_ALL_OF',
-    title: 'IS ALL OF',
-    description: 'Is all of',
-  },
-];
-export const defaultPolicyOperatorConfig = (
-  operator: OperatorDto,
-): PolicyOperatorConfig => ({
-  id: operator,
-  title: operator,
-  description: '',
-});
diff --git a/src/app/component-library/policy-editor/model/policy-verbs.ts b/src/app/component-library/policy-editor/model/policy-verbs.ts
deleted file mode 100644
index a84fbd1b0..000000000
--- a/src/app/component-library/policy-editor/model/policy-verbs.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import {OperatorDto} from '@sovity.de/edc-client';
-import {
-  PolicyFormAdapter,
-  jsonAdapter,
-  localDateAdapter,
-  stringArrayOrCommaJoinedAdapter,
-} from './policy-form-adapter';
-import {policyLeftExpressions} from './policy-left-expressions';
-import {SUPPORTED_POLICY_OPERATORS} from './policy-operators';
-
-export interface PolicyVerbConfig {
-  operandLeftId: string;
-  operandLeftTitle: string;
-  operandLeftDescription: string;
-  operandRightType: 'DATE' | 'TEXT' | 'PARTICIPANT_ID';
-  operandRightHint?: string;
-  operandRightPlaceholder?: string;
-  supportedOperators: OperatorDto[];
-  adapter: PolicyFormAdapter<any>;
-}
-
-export const SUPPORTED_POLICY_VERBS: PolicyVerbConfig[] = [
-  {
-    operandLeftId: policyLeftExpressions.referringConnector,
-    operandLeftTitle: "Consumer's Participant ID",
-    operandLeftDescription:
-      "Consumer's Participant ID, also called Connector ID, of the counter-party connector.",
-    operandRightType: 'PARTICIPANT_ID',
-    supportedOperators: ['EQ', 'IN'],
-    operandRightPlaceholder: 'MDSL1234XX.C1234YY',
-    operandRightHint: 'Multiple values can be joined by comma',
-    adapter: stringArrayOrCommaJoinedAdapter,
-  },
-  {
-    operandLeftId: policyLeftExpressions.policyEvaluationTime,
-    operandLeftTitle: 'Time Restriction',
-    operandLeftDescription:
-      'Time at which the policy is evaluated. This can be used to restrict the data offer to certain time periods',
-    supportedOperators: ['GEQ', 'LEQ', 'GT', 'LT'],
-    operandRightType: 'DATE',
-    operandRightPlaceholder: 'DD/MM/YYYY',
-    operandRightHint: 'DD/MM/YYYY',
-    adapter: localDateAdapter,
-  },
-];
-
-export const defaultPolicyVerbConfig = (verb: string): PolicyVerbConfig => ({
-  operandLeftId: verb,
-  operandLeftTitle: verb,
-  operandLeftDescription: '',
-  supportedOperators: SUPPORTED_POLICY_OPERATORS.map((it) => it.id),
-  operandRightType: 'TEXT',
-  adapter: jsonAdapter,
-});
diff --git a/src/app/component-library/policy-editor/policy-editor.module.ts b/src/app/component-library/policy-editor/policy-editor.module.ts
deleted file mode 100644
index 22130c938..000000000
--- a/src/app/component-library/policy-editor/policy-editor.module.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {SharedModule} from 'src/app/shared.module';
-import {PipesAndDirectivesModule} from '../pipes-and-directives/pipes-and-directives.module';
-import {ParticipantIdSelectComponent} from './editor/controls/participant-id-select/participant-id-select.component';
-import {PolicyFormAddMenuComponent} from './editor/policy-form-add-menu/policy-form-add-menu.component';
-import {PolicyFormExpressionConstraintComponent} from './editor/policy-form-expression-constraint/policy-form-expression-constraint.component';
-import {PolicyFormExpressionEmptyComponent} from './editor/policy-form-expression-empty/policy-form-expression-empty.component';
-import {PolicyFormExpressionMultiComponent} from './editor/policy-form-expression-multi/policy-form-expression-multi.component';
-import {PolicyFormExpressionComponent} from './editor/policy-form-expression/policy-form-expression.component';
-import {PolicyFormRemoveButton} from './editor/policy-form-remove-button/policy-form-remove-button.component';
-import {PolicyOperatorSelectComponent} from './editor/policy-operator-select/policy-operator-select.component';
-import {PolicyExpressionRecipeService} from './editor/recipes/policy-expression-recipe.service';
-import {TimespanRestrictionDialogComponent} from './editor/recipes/timespan-restriction-dialog/timespan-restriction-dialog.component';
-import {PolicyExpressionComponent} from './renderer/policy-expression/policy-expression.component';
-import {PolicyRendererComponent} from './renderer/policy-renderer/policy-renderer.component';
-
-@NgModule({
-  imports: [
-    // Angular
-    CommonModule,
-    FormsModule,
-    ReactiveFormsModule,
-
-    // Angular Material
-    SharedModule,
-
-    // EDC UI Modules
-    PipesAndDirectivesModule,
-  ],
-  declarations: [
-    // ./editor
-    PolicyFormAddMenuComponent,
-    PolicyFormExpressionComponent,
-    PolicyFormExpressionEmptyComponent,
-    PolicyFormExpressionConstraintComponent,
-    PolicyFormExpressionMultiComponent,
-    PolicyFormRemoveButton,
-    PolicyOperatorSelectComponent,
-
-    // ./editor/controls
-    ParticipantIdSelectComponent,
-
-    // ./editor/recipes
-    TimespanRestrictionDialogComponent,
-
-    // ./renderer
-    PolicyRendererComponent,
-    PolicyExpressionComponent,
-  ],
-  providers: [PolicyExpressionRecipeService],
-  exports: [
-    PolicyRendererComponent,
-    PolicyFormExpressionComponent,
-    TimespanRestrictionDialogComponent,
-  ],
-})
-export class PolicyEditorModule {}
diff --git a/src/app/component-library/property-grid/property-grid.module.ts b/src/app/component-library/property-grid/property-grid.module.ts
deleted file mode 100644
index faa613d3c..000000000
--- a/src/app/component-library/property-grid/property-grid.module.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import {ClipboardModule} from '@angular/cdk/clipboard';
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {MatButtonModule} from '@angular/material/button';
-import {MatIconModule} from '@angular/material/icon';
-import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
-import {MatTooltipModule} from '@angular/material/tooltip';
-import {MarkdownDescriptionModule} from '../markdown-description/markdown-description.module';
-import {PipesAndDirectivesModule} from '../pipes-and-directives/pipes-and-directives.module';
-import {PolicyEditorModule} from '../policy-editor/policy-editor.module';
-import {UiElementsModule} from '../ui-elements/ui-elements.module';
-import {PropertyGridGroupComponent} from './property-grid-group/property-grid-group.component';
-import {PropertyGridComponent} from './property-grid/property-grid.component';
-
-@NgModule({
-  imports: [
-    // Angular
-    CommonModule,
-
-    // Angular CDK
-    ClipboardModule,
-
-    // Angular Material
-    MatButtonModule,
-    MatIconModule,
-    MatProgressSpinnerModule,
-    MatTooltipModule,
-
-    // EDC UI Feature Modules
-    PipesAndDirectivesModule,
-    UiElementsModule,
-    PolicyEditorModule,
-    MarkdownDescriptionModule,
-  ],
-  declarations: [PropertyGridComponent, PropertyGridGroupComponent],
-  exports: [PropertyGridComponent, PropertyGridGroupComponent],
-})
-export class PropertyGridModule {}
diff --git a/src/app/component-library/ui-elements/ui-elements.module.ts b/src/app/component-library/ui-elements/ui-elements.module.ts
deleted file mode 100644
index a5ada56e1..000000000
--- a/src/app/component-library/ui-elements/ui-elements.module.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {MatIconModule} from '@angular/material/icon';
-import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
-import {MatTooltipModule} from '@angular/material/tooltip';
-import {AgoComponent} from './ago/ago.component';
-import {AgoPipe} from './ago/ago.pipe';
-import {DateComponent} from './date/date.component';
-import {EmptyStateComponent} from './empty-state/empty-state.component';
-import {ErrorStateComponent} from './error-state/error-state.component';
-import {HorizontalSectionDividerComponent} from './horizontal-section-divider/horizontal-section-divider.component';
-import {LoadingStateComponent} from './loading-state/loading-state.component';
-
-@NgModule({
-  imports: [
-    // Angular
-    CommonModule,
-
-    // Angular Material
-    MatIconModule,
-    MatProgressSpinnerModule,
-    MatTooltipModule,
-  ],
-  declarations: [
-    AgoComponent,
-    AgoPipe,
-    DateComponent,
-    EmptyStateComponent,
-    ErrorStateComponent,
-    HorizontalSectionDividerComponent,
-    LoadingStateComponent,
-  ],
-  exports: [
-    AgoComponent,
-    AgoPipe,
-    DateComponent,
-    EmptyStateComponent,
-    ErrorStateComponent,
-    HorizontalSectionDividerComponent,
-    LoadingStateComponent,
-  ],
-})
-export class UiElementsModule {}
diff --git a/src/app/component-library/url-list-dialog/url-list-dialog.module.ts b/src/app/component-library/url-list-dialog/url-list-dialog.module.ts
deleted file mode 100644
index 36afa6492..000000000
--- a/src/app/component-library/url-list-dialog/url-list-dialog.module.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {FormsModule} from '@angular/forms';
-import {MatButtonModule} from '@angular/material/button';
-import {MatCardModule} from '@angular/material/card';
-import {MatDialogModule} from '@angular/material/dialog';
-import {MatIconModule} from '@angular/material/icon';
-import {TranslateModule} from '@ngx-translate/core';
-import {NgxJsonViewerModule} from 'ngx-json-viewer';
-import {ConfirmationDialogModule} from '../confirmation-dialog/confirmation-dialog.module';
-import {MarkdownDescriptionModule} from '../markdown-description/markdown-description.module';
-import {PipesAndDirectivesModule} from '../pipes-and-directives/pipes-and-directives.module';
-import {UrlListDialogComponent} from './url-list-dialog/url-list-dialog.component';
-import {UrlListDialogService} from './url-list-dialog/url-list-dialog.service';
-
-@NgModule({
-  imports: [
-    // Angular
-    CommonModule,
-    FormsModule,
-    TranslateModule,
-    // Angular Material
-    MatButtonModule,
-    MatCardModule,
-    MatDialogModule,
-    MatIconModule,
-
-    // Third Party
-    NgxJsonViewerModule,
-
-    // EDC UI Modules
-    PipesAndDirectivesModule,
-    ConfirmationDialogModule,
-    MarkdownDescriptionModule,
-  ],
-  declarations: [UrlListDialogComponent],
-  providers: [UrlListDialogService],
-  exports: [UrlListDialogComponent],
-})
-export class UrlListDialogModule {}
diff --git a/src/app/core/adapters/custom-date-adapter.ts b/src/app/core/adapters/custom-date-adapter.ts
index d9355d450..d920b162c 100644
--- a/src/app/core/adapters/custom-date-adapter.ts
+++ b/src/app/core/adapters/custom-date-adapter.ts
@@ -1,7 +1,9 @@
+import {Injectable} from '@angular/core';
 import {NativeDateAdapter} from '@angular/material/core';
 import {isValid, parse as parseDate} from 'date-fns';
 import {format as formateDate} from 'date-fns-tz';
 
+@Injectable()
 export class CustomDateAdapter extends NativeDateAdapter {
   parse(value: any): Date | null {
     if (typeof value === 'string' && value.indexOf('/') > -1) {
diff --git a/src/app/core/services/api/fake-backend/connector-fake-impl/data/test-policies.ts b/src/app/core/services/api/fake-backend/connector-fake-impl/data/test-policies.ts
index 43585777d..5ca6b3547 100644
--- a/src/app/core/services/api/fake-backend/connector-fake-impl/data/test-policies.ts
+++ b/src/app/core/services/api/fake-backend/connector-fake-impl/data/test-policies.ts
@@ -1,10 +1,10 @@
 import {UiPolicy, UiPolicyExpression} from '@sovity.de/edc-client';
-import {policyLeftExpressions} from '../../../../../../component-library/policy-editor/model/policy-left-expressions';
+import {policyLeftExpressions} from '../../../../../../shared/business/policy-editor/model/policy-left-expressions';
 import {
   constraint,
   constraintList,
   multi,
-} from '../../../../../../component-library/policy-editor/model/ui-policy-expression-utils';
+} from '../../../../../../shared/business/policy-editor/model/ui-policy-expression-utils';
 
 export namespace TestPolicies {
   const policy = (
diff --git a/src/app/core/services/api/fake-backend/connector-fake-impl/policy-definition-fake-service.ts b/src/app/core/services/api/fake-backend/connector-fake-impl/policy-definition-fake-service.ts
index 6de17bd83..18e1a1f80 100644
--- a/src/app/core/services/api/fake-backend/connector-fake-impl/policy-definition-fake-service.ts
+++ b/src/app/core/services/api/fake-backend/connector-fake-impl/policy-definition-fake-service.ts
@@ -7,7 +7,7 @@ import {
   PolicyDefinitionPage,
   UiPolicyExpression,
 } from '@sovity.de/edc-client';
-import {ALWAYS_TRUE_POLICY_ID} from 'src/app/component-library/edit-asset-form/edit-asset-form/form/model/always-true-policy-id';
+import {ALWAYS_TRUE_POLICY_ID} from '../../../../../shared/business/edit-asset-form/form/model/always-true-policy-id';
 import {TestPolicies} from './data/test-policies';
 
 let policyDefinitions: PolicyDefinitionDto[] = [
diff --git a/src/app/core/services/api/fake-backend/edc-fake-backend.ts b/src/app/core/services/api/fake-backend/edc-fake-backend.ts
index 305ab99fe..4847d09ba 100644
--- a/src/app/core/services/api/fake-backend/edc-fake-backend.ts
+++ b/src/app/core/services/api/fake-backend/edc-fake-backend.ts
@@ -194,8 +194,10 @@ export const EDC_FAKE_BACKEND: FetchAPI = async (
     .url('ui/pages/contract-agreement-page/*')
     .on('GET', (contractAgreementId: String) => {
       return ok(
-        contractAgreementPage().contractAgreements
-          .find( (contractAgreement) => contractAgreement.contractAgreementId === contractAgreementId)
+        contractAgreementPage().contractAgreements.find(
+          (contractAgreement) =>
+            contractAgreement.contractAgreementId === contractAgreementId,
+        ),
       );
     })
 
diff --git a/src/app/core/services/asset-builder.ts b/src/app/core/services/asset-builder.ts
index d02202341..7fba6a0b2 100644
--- a/src/app/core/services/asset-builder.ts
+++ b/src/app/core/services/asset-builder.ts
@@ -1,13 +1,13 @@
 import {Injectable} from '@angular/core';
 import {UiAsset} from '@sovity.de/edc-client';
-import {DataCategorySelectItem} from 'src/app/component-library/edit-asset-form/data-category-select/data-category-select-item';
-import {DataCategorySelectItemService} from 'src/app/component-library/edit-asset-form/data-category-select/data-category-select-item.service';
-import {DataSubcategorySelectItem} from 'src/app/component-library/edit-asset-form/data-subcategory-select/data-subcategory-select-item';
-import {DataSubcategorySelectItemService} from 'src/app/component-library/edit-asset-form/data-subcategory-select/data-subcategory-select-item.service';
-import {LanguageSelectItem} from 'src/app/component-library/edit-asset-form/language-select/language-select-item';
-import {LanguageSelectItemService} from 'src/app/component-library/edit-asset-form/language-select/language-select-item.service';
-import {TransportModeSelectItem} from 'src/app/component-library/edit-asset-form/transport-mode-select/transport-mode-select-item';
-import {TransportModeSelectItemService} from 'src/app/component-library/edit-asset-form/transport-mode-select/transport-mode-select-item.service';
+import {DataCategorySelectItem} from '../../shared/form-elements/data-category-select/data-category-select-item';
+import {DataCategorySelectItemService} from '../../shared/form-elements/data-category-select/data-category-select-item.service';
+import {DataSubcategorySelectItem} from '../../shared/form-elements/data-subcategory-select/data-subcategory-select-item';
+import {DataSubcategorySelectItemService} from '../../shared/form-elements/data-subcategory-select/data-subcategory-select-item.service';
+import {LanguageSelectItem} from '../../shared/form-elements/language-select/language-select-item';
+import {LanguageSelectItemService} from '../../shared/form-elements/language-select/language-select-item.service';
+import {TransportModeSelectItem} from '../../shared/form-elements/transport-mode-select/transport-mode-select-item';
+import {TransportModeSelectItemService} from '../../shared/form-elements/transport-mode-select/transport-mode-select-item.service';
 import {AdditionalAssetProperty, UiAssetMapped} from './models/ui-asset-mapped';
 
 /**
diff --git a/src/app/core/services/asset-data-source-mapper-legacy.ts b/src/app/core/services/asset-data-source-mapper-legacy.ts
index e05e8787c..fb68d58b3 100644
--- a/src/app/core/services/asset-data-source-mapper-legacy.ts
+++ b/src/app/core/services/asset-data-source-mapper-legacy.ts
@@ -1,7 +1,7 @@
 import {Injectable} from '@angular/core';
 import {UiDataSource} from '@sovity.de/edc-client';
-import {AssetDatasourceFormValue} from '../../routes/connector-ui/asset-page/asset-edit-dialog/form/model/asset-datasource-form-model';
-import {HttpDatasourceHeaderFormValue} from '../../routes/connector-ui/asset-page/asset-edit-dialog/form/model/http-datasource-header-form-model';
+import {AssetDatasourceFormValue} from '../../routes/connector-ui/asset-list-page/asset-create-dialog/form/model/asset-datasource-form-model';
+import {HttpDatasourceHeaderFormValue} from '../../routes/connector-ui/asset-list-page/asset-create-dialog/form/model/http-datasource-header-form-model';
 import {getAuthFields} from '../utils/form-value-utils';
 import {QueryParamsMapper} from './query-params-mapper';
 
diff --git a/src/app/core/services/asset-data-source-mapper.ts b/src/app/core/services/asset-data-source-mapper.ts
index 5f0462f2a..03f4b74d4 100644
--- a/src/app/core/services/asset-data-source-mapper.ts
+++ b/src/app/core/services/asset-data-source-mapper.ts
@@ -1,7 +1,7 @@
 import {Injectable} from '@angular/core';
 import {UiDataSource} from '@sovity.de/edc-client';
-import {AssetDatasourceFormValue} from 'src/app/component-library/edit-asset-form/edit-asset-form/form/model/asset-datasource-form-model';
-import {HttpDatasourceHeaderFormValue} from 'src/app/component-library/edit-asset-form/edit-asset-form/form/model/http-datasource-header-form-model';
+import {AssetDatasourceFormValue} from '../../shared/business/edit-asset-form/form/model/asset-datasource-form-model';
+import {HttpDatasourceHeaderFormValue} from '../../shared/business/edit-asset-form/form/model/http-datasource-header-form-model';
 import {getAuthFields} from '../utils/form-value-utils';
 import {QueryParamsMapper} from './query-params-mapper';
 
diff --git a/src/app/core/services/asset-request-builder-legacy.ts b/src/app/core/services/asset-request-builder-legacy.ts
index fb77fe190..e97533f70 100644
--- a/src/app/core/services/asset-request-builder-legacy.ts
+++ b/src/app/core/services/asset-request-builder-legacy.ts
@@ -1,6 +1,6 @@
 import {Injectable} from '@angular/core';
-import {UiAssetCreateRequest, UiAssetEditRequest} from '@sovity.de/edc-client';
-import {AssetEditorDialogFormValue} from '../../routes/connector-ui/asset-page/asset-edit-dialog/form/model/asset-editor-dialog-form-model';
+import {UiAssetCreateRequest} from '@sovity.de/edc-client';
+import {AssetCreateDialogFormValue} from '../../routes/connector-ui/asset-list-page/asset-create-dialog/form/model/asset-create-dialog-form-model';
 import {toGmtZeroHourDate} from '../utils/date-utils';
 import {AssetDataSourceMapperLegacy} from './asset-data-source-mapper-legacy';
 import {AssetRequestCommonMetadata} from './asset-request-common-metadata';
@@ -10,7 +10,7 @@ export class AssetRequestBuilderLegacy {
   constructor(private assetDataSourceMapper: AssetDataSourceMapperLegacy) {}
 
   buildAssetCreateRequestLegacy(
-    formValue: AssetEditorDialogFormValue,
+    formValue: AssetCreateDialogFormValue,
   ): UiAssetCreateRequest {
     const id = formValue.metadata?.id!;
     const metadata = this.buildAssetRequestCommonMetadataLegacy(formValue);
@@ -24,22 +24,8 @@ export class AssetRequestBuilderLegacy {
     };
   }
 
-  buildAssetEditRequestLegacy(
-    formValue: AssetEditorDialogFormValue,
-  ): UiAssetEditRequest {
-    const metadata = this.buildAssetRequestCommonMetadataLegacy(formValue);
-    const dataSourceOrNull =
-      this.assetDataSourceMapper.buildDataSourceOrNullLegacy(
-        formValue.datasource!,
-      );
-    return {
-      ...metadata,
-      dataSourceOverrideOrNull: dataSourceOrNull ?? undefined,
-    };
-  }
-
   buildAssetRequestCommonMetadataLegacy(
-    formValue: AssetEditorDialogFormValue,
+    formValue: AssetCreateDialogFormValue,
   ): AssetRequestCommonMetadata {
     const title = formValue.metadata?.title!;
     const version = formValue.metadata?.version;
diff --git a/src/app/core/services/asset-request-builder.ts b/src/app/core/services/asset-request-builder.ts
index 45fd05d49..284b71987 100644
--- a/src/app/core/services/asset-request-builder.ts
+++ b/src/app/core/services/asset-request-builder.ts
@@ -1,6 +1,6 @@
 import {Injectable} from '@angular/core';
 import {UiAssetCreateRequest, UiAssetEditRequest} from '@sovity.de/edc-client';
-import {EditAssetFormValue} from 'src/app/component-library/edit-asset-form/edit-asset-form/form/model/edit-asset-form-model';
+import {EditAssetFormValue} from 'src/app/shared/business/edit-asset-form/form/model/edit-asset-form-model';
 import {toGmtZeroHourDate} from '../utils/date-utils';
 import {AssetDataSourceMapper} from './asset-data-source-mapper';
 import {AssetRequestCommonMetadata} from './asset-request-common-metadata';
diff --git a/src/app/core/services/connector-info-property-grid-group-builder.ts b/src/app/core/services/connector-info-property-grid-group-builder.ts
index cefbba33d..64faf64af 100644
--- a/src/app/core/services/connector-info-property-grid-group-builder.ts
+++ b/src/app/core/services/connector-info-property-grid-group-builder.ts
@@ -1,18 +1,12 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
 import {Injectable} from '@angular/core';
 import {MatDialog} from '@angular/material/dialog';
 import {TranslateService} from '@ngx-translate/core';
 import {DashboardPage} from '@sovity.de/edc-client';
-import {JsonDialogComponent} from '../../component-library/json-dialog/json-dialog/json-dialog.component';
-import {JsonDialogData} from '../../component-library/json-dialog/json-dialog/json-dialog.data';
-import {PropertyGridGroup} from '../../component-library/property-grid/property-grid-group/property-grid-group';
-import {PropertyGridField} from '../../component-library/property-grid/property-grid/property-grid-field';
-import {PropertyGridFieldService} from '../../component-library/property-grid/property-grid/property-grid-field.service';
+import {JsonDialogComponent} from '../../shared/common/json-dialog/json-dialog.component';
+import {JsonDialogData} from '../../shared/common/json-dialog/json-dialog.data';
+import {PropertyGridGroup} from '../../shared/common/property-grid-group/property-grid-group';
+import {PropertyGridField} from '../../shared/common/property-grid/property-grid-field';
+import {PropertyGridFieldService} from '../../shared/common/property-grid/property-grid-field.service';
 import {LastCommitInfo} from './api/model/last-commit-info';
 import {Fetched} from './models/fetched';
 import {ParticipantIdLocalization} from './participant-id-localization';
@@ -101,7 +95,7 @@ export class ConnectorInfoPropertyGridGroupBuilder {
                 ifOk: (uiCommitdata) => uiCommitdata,
                 ifError: (error) => error.failureMessage,
                 ifLoading: () =>
-                  this.translateService.instant('general.loading2'),
+                  this.translateService.instant('general.still_loading'),
               }),
             }),
         },
@@ -134,11 +128,13 @@ export class ConnectorInfoPropertyGridGroupBuilder {
     const fields: PropertyGridField[] = dashboardData.match<
       PropertyGridField[]
     >({
-      ifLoading: () => [{
-        icon: 'info',
-        label: this.translateService.instant('general.loading1'),
-        text: this.translateService.instant('general.loading')
-      }],
+      ifLoading: () => [
+        {
+          icon: 'info',
+          label: this.translateService.instant('general.loading1'),
+          text: this.translateService.instant('general.loading'),
+        },
+      ],
       ifError: () => [
         {
           icon: 'error',
diff --git a/src/app/core/services/contract-negotiation.service.ts b/src/app/core/services/contract-negotiation.service.ts
index b1d6cdbee..d813ee12c 100644
--- a/src/app/core/services/contract-negotiation.service.ts
+++ b/src/app/core/services/contract-negotiation.service.ts
@@ -1,9 +1,3 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
 import {Injectable} from '@angular/core';
 import {MatDialog} from '@angular/material/dialog';
 import {EMPTY, Observable, interval} from 'rxjs';
@@ -14,8 +8,8 @@ import {
   UiContractNegotiation,
   UiContractOffer,
 } from '@sovity.de/edc-client';
-import {InitiateNegotiationConfirmTosDialogComponent} from 'src/app/component-library/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component';
 import {environment} from '../../../environments/environment';
+import {InitiateNegotiationConfirmTosDialogComponent} from '../../shared/business/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component';
 import {EdcApiService} from './api/edc-api.service';
 import {DataOffer} from './models/data-offer';
 import {NotificationService} from './notification.service';
diff --git a/src/app/core/services/models/contract-offer.ts b/src/app/core/services/models/contract-offer.ts
index 8dad1ebaf..52d0a570b 100644
--- a/src/app/core/services/models/contract-offer.ts
+++ b/src/app/core/services/models/contract-offer.ts
@@ -1,5 +1,5 @@
 import {UiContractOffer} from '@sovity.de/edc-client';
-import {PropertyGridField} from '../../../component-library/property-grid/property-grid/property-grid-field';
+import {PropertyGridField} from '../../../shared/common/property-grid/property-grid-field';
 
 export type ContractOffer = UiContractOffer & {
   properties: PropertyGridField[];
diff --git a/src/app/core/services/models/ui-asset-mapped.ts b/src/app/core/services/models/ui-asset-mapped.ts
index 2a13f58f6..3a22b72be 100644
--- a/src/app/core/services/models/ui-asset-mapped.ts
+++ b/src/app/core/services/models/ui-asset-mapped.ts
@@ -1,8 +1,8 @@
 import {UiAsset} from '@sovity.de/edc-client';
-import {DataCategorySelectItem} from 'src/app/component-library/edit-asset-form/data-category-select/data-category-select-item';
-import {DataSubcategorySelectItem} from 'src/app/component-library/edit-asset-form/data-subcategory-select/data-subcategory-select-item';
-import {LanguageSelectItem} from 'src/app/component-library/edit-asset-form/language-select/language-select-item';
-import {TransportModeSelectItem} from 'src/app/component-library/edit-asset-form/transport-mode-select/transport-mode-select-item';
+import {DataCategorySelectItem} from '../../../shared/form-elements/data-category-select/data-category-select-item';
+import {DataSubcategorySelectItem} from '../../../shared/form-elements/data-subcategory-select/data-subcategory-select-item';
+import {LanguageSelectItem} from '../../../shared/form-elements/language-select/language-select-item';
+import {TransportModeSelectItem} from '../../../shared/form-elements/transport-mode-select/transport-mode-select-item';
 
 /**
  * UiAsset with replaced fixed vocabulary items.
diff --git a/src/app/core/services/nav-items-builder.ts b/src/app/core/services/nav-items-builder.ts
index 605c7880e..2dec50ed4 100644
--- a/src/app/core/services/nav-items-builder.ts
+++ b/src/app/core/services/nav-items-builder.ts
@@ -17,25 +17,41 @@ export class NavItemsBuilder {
     {
       title: 'Providing',
       items: [
-        {path: 'create-asset', icon: 'post_add', title: 'Create Data Offer'},
-        {path: 'my-assets', icon: 'upload', title: 'Assets'},
-        {path: 'policies', icon: 'policy', title: 'Policies'},
+        {
+          path: 'create-asset',
+          icon: 'post_add',
+          title: 'create_data_offer_page.title',
+        },
+        {path: 'my-assets', icon: 'upload', title: 'asset_list_page.title'},
+        {
+          path: 'policies',
+          icon: 'policy',
+          title: 'policy_definition_page.title',
+        },
         {
           path: 'data-offers',
           icon: 'rule',
-          title: 'Data Offers',
+          title: 'contract_definition_page.title',
         },
       ],
     },
     {
       title: 'Consuming',
       items: [
-        {path: 'catalog-browser', icon: 'sim_card', title: 'Catalog Browser'},
-        {path: 'contracts', icon: 'assignment_turned_in', title: 'Contracts'},
+        {
+          path: 'catalog-browser',
+          icon: 'sim_card',
+          title: 'catalog_browser_page.title',
+        },
+        {
+          path: 'contracts',
+          icon: 'assignment_turned_in',
+          title: 'contract_agreement_page.title',
+        },
         {
           path: 'transfer-history',
           icon: 'assignment',
-          title: 'Transfer History',
+          title: 'transfer_history_page.title',
         },
       ],
     },
@@ -44,7 +60,7 @@ export class NavItemsBuilder {
         {
           path: 'logout',
           icon: 'logout',
-          title: 'Logout',
+          title: 'logout_page.title',
           requiresFeature: 'logout-button',
         },
       ],
diff --git a/src/app/core/services/page-title-strategy.ts b/src/app/core/services/page-title-strategy.ts
index 7c84fe413..be687093d 100644
--- a/src/app/core/services/page-title-strategy.ts
+++ b/src/app/core/services/page-title-strategy.ts
@@ -1,30 +1,42 @@
-/*
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
 import {Injectable} from '@angular/core';
 import {Title} from '@angular/platform-browser';
-import {RouterStateSnapshot, TitleStrategy} from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  RouterStateSnapshot,
+  TitleStrategy,
+} from '@angular/router';
+import {Subject, switchMap} from 'rxjs';
 import {TranslateService} from '@ngx-translate/core';
 
 @Injectable()
 export class CustomPageTitleStrategy extends TitleStrategy {
+  rawTitle$ = new Subject<string>();
+
   constructor(
     private translateService: TranslateService,
-    private readonly title: Title,
+    private title: Title,
   ) {
     super();
+    this.rawTitle$
+      .pipe(switchMap((title) => this.translateService.get(title)))
+      .subscribe((title) => this.title.setTitle(title));
   }
 
   override updateTitle(snapshot: RouterStateSnapshot): void {
-    const title = this.buildTitle(snapshot);
-    if (title) {
-      this.translateService.get(title).subscribe((translatedTitle) => {
-        this.title.setTitle(translatedTitle);
-      });
-    } else {
-      this.title.setTitle('DEFAULT_TITLE');
+    const data = this.getRouteDataRecursively(snapshot);
+    const titleUntranslated = data.title ?? 'EDC Connector';
+    this.rawTitle$.next(titleUntranslated);
+  }
+
+  private getRouteDataRecursively(
+    routerStateSnapshot: RouterStateSnapshot,
+  ): any {
+    let snapshot: ActivatedRouteSnapshot | null = routerStateSnapshot.root;
+    let data = {};
+    while (snapshot) {
+      data = {...data, ...snapshot.data};
+      snapshot = snapshot.firstChild;
     }
+    return data;
   }
 }
diff --git a/src/app/core/services/participant-id-localization.ts b/src/app/core/services/participant-id-localization.ts
index 0914ce4b0..d453027da 100644
--- a/src/app/core/services/participant-id-localization.ts
+++ b/src/app/core/services/participant-id-localization.ts
@@ -1,9 +1,3 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
 import {Inject, Injectable} from '@angular/core';
 import {TranslateService} from '@ngx-translate/core';
 import {APP_CONFIG, AppConfig} from '../config/app-config';
diff --git a/src/app/core/services/query-params-mapper.ts b/src/app/core/services/query-params-mapper.ts
index b03ff896d..54377fbba 100644
--- a/src/app/core/services/query-params-mapper.ts
+++ b/src/app/core/services/query-params-mapper.ts
@@ -1,5 +1,5 @@
 import {Injectable} from '@angular/core';
-import {HttpDatasourceQueryParamFormValue} from 'src/app/component-library/edit-asset-form/edit-asset-form/form/model/http-datasource-query-param-form-model';
+import {HttpDatasourceQueryParamFormValue} from '../../shared/business/edit-asset-form/form/model/http-datasource-query-param-form-model';
 import {
   everythingAfter,
   everythingBefore,
diff --git a/src/app/core/services/title-utils.service.ts b/src/app/core/services/title-utils.service.ts
deleted file mode 100644
index ef372f793..000000000
--- a/src/app/core/services/title-utils.service.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import {Injectable} from '@angular/core';
-import {Title} from '@angular/platform-browser';
-import {
-  ActivatedRoute,
-  ActivatedRouteSnapshot,
-  NavigationEnd,
-  Router,
-} from '@angular/router';
-import {concat, of} from 'rxjs';
-import {filter, map, shareReplay} from 'rxjs/operators';
-
-@Injectable()
-export class TitleUtilsService {
-  routeData$ = this.routeDone$().pipe(
-    map(() => this.getRouteDataRecursively()),
-    shareReplay(1),
-  );
-
-  title$ = this.routeData$.pipe(map((data) => data.title));
-
-  constructor(
-    private router: Router,
-    private titleService: Title,
-    private activatedRoute: ActivatedRoute,
-  ) {}
-
-  startUpdatingTitleFromRouteData(defaultTitle: string) {
-    this.title$.subscribe((title) => {
-      let fullTitle = title ?? defaultTitle;
-      this.titleService.setTitle(fullTitle);
-    });
-  }
-
-  private routeDone$() {
-    return concat(
-      of({}),
-      this.router.events.pipe(
-        filter((event) => event instanceof NavigationEnd),
-      ),
-    );
-  }
-
-  private getRouteDataRecursively(): any {
-    let snapshot: ActivatedRouteSnapshot | null = this.activatedRoute.snapshot;
-    let data = {};
-    while (snapshot) {
-      data = {...data, ...snapshot.data};
-      snapshot = snapshot.firstChild;
-    }
-    return data;
-  }
-}
diff --git a/src/app/core/services/transfer-data-sink-mapper.ts b/src/app/core/services/transfer-data-sink-mapper.ts
index a97285b78..77f6f4c05 100644
--- a/src/app/core/services/transfer-data-sink-mapper.ts
+++ b/src/app/core/services/transfer-data-sink-mapper.ts
@@ -1,6 +1,6 @@
 import {Injectable} from '@angular/core';
-import {HttpDatasourceHeaderFormValue} from 'src/app/component-library/edit-asset-form/edit-asset-form/form/model/http-datasource-header-form-model';
 import {ContractAgreementTransferDialogFormValue} from '../../routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog-form-model';
+import {HttpDatasourceHeaderFormValue} from '../../shared/business/edit-asset-form/form/model/http-datasource-header-form-model';
 import {getAuthFields} from '../utils/form-value-utils';
 import {mapKeys, removeNullValues} from '../utils/record-utils';
 import {DataAddressProperty} from './models/data-address-properties';
diff --git a/src/app/core/utils/form-value-utils.ts b/src/app/core/utils/form-value-utils.ts
index 4908e54a2..a67c96b7f 100644
--- a/src/app/core/utils/form-value-utils.ts
+++ b/src/app/core/utils/form-value-utils.ts
@@ -1,5 +1,5 @@
-import {AssetDatasourceFormValue} from 'src/app/component-library/edit-asset-form/edit-asset-form/form/model/asset-datasource-form-model';
 import {ContractAgreementTransferDialogFormValue} from '../../routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog-form-model';
+import {AssetDatasourceFormValue} from '../../shared/business/edit-asset-form/form/model/asset-datasource-form-model';
 
 export function getAuthFields(
   formValue:
diff --git a/src/app/core/utils/lazy-utils.ts b/src/app/core/utils/lazy-utils.ts
new file mode 100644
index 000000000..12774e261
--- /dev/null
+++ b/src/app/core/utils/lazy-utils.ts
@@ -0,0 +1,21 @@
+import {TranslateService} from '@ngx-translate/core';
+
+export class LazyTranslation<T> {
+  private value: T | null = null;
+  private language: string | null = null;
+  constructor(
+    private translateService: TranslateService,
+    private generate: (translationService: TranslateService) => T,
+  ) {}
+
+  getValue(): T {
+    if (
+      this.value == null ||
+      this.language !== this.translateService.currentLang
+    ) {
+      this.language = this.translateService.currentLang;
+      this.value = this.generate(this.translateService);
+    }
+    return this.value;
+  }
+}
diff --git a/src/app/routes/connector-ui/asset-edit-page/asset-edit-page.module.ts b/src/app/routes/connector-ui/asset-edit-page/asset-edit-page.module.ts
index f0b5c9814..39a28a6a9 100644
--- a/src/app/routes/connector-ui/asset-edit-page/asset-edit-page.module.ts
+++ b/src/app/routes/connector-ui/asset-edit-page/asset-edit-page.module.ts
@@ -1,8 +1,7 @@
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {RouterModule} from '@angular/router';
-import {EditAssetFormModule} from '../../../component-library/edit-asset-form/edit-asset-form.module';
-import {UiElementsModule} from '../../../component-library/ui-elements/ui-elements.module';
+import {SharedModule} from '../../../shared/shared.module';
 import {AssetEditPageComponent} from './asset-edit-page/asset-edit-page.component';
 
 @NgModule({
@@ -12,8 +11,7 @@ import {AssetEditPageComponent} from './asset-edit-page/asset-edit-page.componen
     RouterModule,
 
     // EDC UI Modules
-    EditAssetFormModule,
-    UiElementsModule,
+    SharedModule,
   ],
   declarations: [AssetEditPageComponent],
   exports: [AssetEditPageComponent],
diff --git a/src/app/routes/connector-ui/asset-edit-page/asset-edit-page/asset-edit-page.component.ts b/src/app/routes/connector-ui/asset-edit-page/asset-edit-page/asset-edit-page.component.ts
index f5896dff2..90a712e32 100644
--- a/src/app/routes/connector-ui/asset-edit-page/asset-edit-page/asset-edit-page.component.ts
+++ b/src/app/routes/connector-ui/asset-edit-page/asset-edit-page/asset-edit-page.component.ts
@@ -6,15 +6,6 @@ import {
   UiAssetEditRequest,
   UiCriterionLiteralType,
 } from '@sovity.de/edc-client';
-import {AssetAdvancedFormBuilder} from 'src/app/component-library/edit-asset-form/edit-asset-form/form/asset-advanced-form-builder';
-import {AssetDatasourceFormBuilder} from 'src/app/component-library/edit-asset-form/edit-asset-form/form/asset-datasource-form-builder';
-import {AssetGeneralFormBuilder} from 'src/app/component-library/edit-asset-form/edit-asset-form/form/asset-general-form-builder';
-import {EditAssetForm} from 'src/app/component-library/edit-asset-form/edit-asset-form/form/edit-asset-form';
-import {EditAssetFormInitializer} from 'src/app/component-library/edit-asset-form/edit-asset-form/form/edit-asset-form-initializer';
-import {ALWAYS_TRUE_POLICY_ID} from 'src/app/component-library/edit-asset-form/edit-asset-form/form/model/always-true-policy-id';
-import {EditAssetFormValue} from 'src/app/component-library/edit-asset-form/edit-asset-form/form/model/edit-asset-form-model';
-import {ExpressionFormControls} from 'src/app/component-library/policy-editor/editor/expression-form-controls';
-import {ExpressionFormHandler} from 'src/app/component-library/policy-editor/editor/expression-form-handler';
 import {EdcApiService} from 'src/app/core/services/api/edc-api.service';
 import {AssetRequestBuilder} from 'src/app/core/services/asset-request-builder';
 import {AssetService} from 'src/app/core/services/asset.service';
@@ -22,21 +13,18 @@ import {AssetProperty} from 'src/app/core/services/models/asset-properties';
 import {Fetched} from 'src/app/core/services/models/fetched';
 import {UiAssetMapped} from 'src/app/core/services/models/ui-asset-mapped';
 import {NotificationService} from 'src/app/core/services/notification.service';
-import {PolicyDefinitionCreatePageForm} from '../../policy-definition-create-page/policy-definition-create-page/policy-definition-create-page-form';
+import {editAssetFormRequiredViewProviders} from '../../../../shared/business/edit-asset-form/edit-asset-form-required-providers';
+import {EditAssetForm} from '../../../../shared/business/edit-asset-form/form/edit-asset-form';
+import {EditAssetFormInitializer} from '../../../../shared/business/edit-asset-form/form/edit-asset-form-initializer';
+import {ALWAYS_TRUE_POLICY_ID} from '../../../../shared/business/edit-asset-form/form/model/always-true-policy-id';
+import {EditAssetFormValue} from '../../../../shared/business/edit-asset-form/form/model/edit-asset-form-model';
+import {ExpressionFormHandler} from '../../../../shared/business/policy-editor/editor/expression-form-handler';
 
 @Component({
   selector: 'asset-edit-page',
   templateUrl: './asset-edit-page.component.html',
   providers: [EditAssetFormInitializer, AssetRequestBuilder],
-  viewProviders: [
-    EditAssetForm,
-    AssetGeneralFormBuilder,
-    AssetDatasourceFormBuilder,
-    AssetAdvancedFormBuilder,
-    ExpressionFormHandler,
-    ExpressionFormControls,
-    PolicyDefinitionCreatePageForm,
-  ],
+  viewProviders: editAssetFormRequiredViewProviders,
 })
 export class AssetEditPageComponent implements OnInit {
   asset: Fetched<UiAssetMapped | undefined> = new Fetched(
diff --git a/src/app/routes/connector-ui/asset-page/asset-cards/asset-cards.component.html b/src/app/routes/connector-ui/asset-list-page/asset-cards/asset-cards.component.html
similarity index 100%
rename from src/app/routes/connector-ui/asset-page/asset-cards/asset-cards.component.html
rename to src/app/routes/connector-ui/asset-list-page/asset-cards/asset-cards.component.html
diff --git a/src/app/routes/connector-ui/asset-page/asset-cards/asset-cards.component.ts b/src/app/routes/connector-ui/asset-list-page/asset-cards/asset-cards.component.ts
similarity index 100%
rename from src/app/routes/connector-ui/asset-page/asset-cards/asset-cards.component.ts
rename to src/app/routes/connector-ui/asset-list-page/asset-cards/asset-cards.component.ts
diff --git a/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog-data.ts b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog-data.ts
new file mode 100644
index 000000000..fac8c22aa
--- /dev/null
+++ b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog-data.ts
@@ -0,0 +1,5 @@
+import {AssetCreateDialogFormValue} from './form/model/asset-create-dialog-form-model';
+
+export interface AssetCreateDialogData {
+  initialFormValue: AssetCreateDialogFormValue;
+}
diff --git a/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog-mode.ts b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog-mode.ts
new file mode 100644
index 000000000..f5b88fb2a
--- /dev/null
+++ b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog-mode.ts
@@ -0,0 +1 @@
+export type AssetCreateDialogMode = 'CREATE' | 'EDIT';
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog-result.ts b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog-result.ts
similarity index 84%
rename from src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog-result.ts
rename to src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog-result.ts
index af21e6881..acfc47fff 100644
--- a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog-result.ts
+++ b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog-result.ts
@@ -1,6 +1,6 @@
 import {UiAssetMapped} from '../../../../core/services/models/ui-asset-mapped';
 
-export interface AssetEditDialogResult {
+export interface AssetCreateDialogResult {
   /**
    * Updated asset list for the asset page
    */
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog.component.html b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog.component.html
similarity index 87%
rename from src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog.component.html
rename to src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog.component.html
index 89c211d3f..d94002753 100644
--- a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog.component.html
+++ b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog.component.html
@@ -1,12 +1,14 @@
 <h1 mat-dialog-title>
-  {{ form.mode === 'CREATE' ? 'Create New Asset' : 'Edit Asset' }}
+  {{ 'asset_list_page.create_asset' | translate }}
 </h1>
 <mat-dialog-content class="w-[800px]">
   <mat-vertical-stepper [linear]="true">
     <!-- Step: Metadata -->
     <mat-step [stepControl]="form.metadata">
       <form [formGroup]="form.metadata">
-        <ng-template matStepLabel>General Information</ng-template>
+        <ng-template matStepLabel>{{
+          'asset_list_page.information' | translate
+        }}</ng-template>
         <div class="flex flex-col mt-[10px]">
           <div class="flex flex-row space-x-[10px]">
             <!-- Title -->
@@ -27,7 +29,7 @@ <h1 mat-dialog-title>
 
             <!-- Version -->
             <mat-form-field class="grow">
-              <mat-label>Version</mat-label>
+              <mat-label>{{ 'asset_list_page.version' | translate }}</mat-label>
               <input
                 matInput
                 autocomplete="new-id"
@@ -47,7 +49,7 @@ <h1 mat-dialog-title>
           <mat-form-field
             *ngIf="form.metadata.controls.id; let ctrl"
             class="grow">
-            <mat-label>Asset ID</mat-label>
+            <mat-label>{{ 'asset_list_page.asset_id' | translate }}</mat-label>
             <input
               placeholder="my-asset-1"
               matInput
@@ -74,7 +76,7 @@ <h1 mat-dialog-title>
           <!-- Description -->
 
           <mat-form-field>
-            <mat-label>Description</mat-label>
+            <mat-label>{{ 'asset_list_page.file_des' | translate }}</mat-label>
             <textarea
               class="h-36"
               matInput
@@ -83,7 +85,7 @@ <h1 mat-dialog-title>
                 '# My Asset\n\nAt vero eos et accusam et justo duo dolores et ea rebum.\n\n## Details\n\nAt vero eos et accusam et justo duo dolores et ea **rebum**.'
               "></textarea>
             <mat-hint class="flex flex-row items-center gap-1 mb-1">
-              The description supports
+              {{ 'asset_list_page.descrip' | translate }}
               <a
                 class="link"
                 externalLink
@@ -97,19 +99,19 @@ <h1 mat-dialog-title>
 
           <!-- Keywords -->
           <keyword-select
-            label="Keywords"
+            [label]="'asset_list_page.keywords' | translate"
             [control]="form.metadata.controls.keywords"></keyword-select>
 
           <!-- Language -->
           <language-select
             class="grow"
-            label="Language of the content"
+            [label]="'general.language' | translate"
             [control]="form.metadata.controls.language"></language-select>
 
           <div class="flex flex-row space-x-[10px]">
             <!-- Content Type -->
             <mat-form-field class="grow mb-2">
-              <mat-label>Content Type</mat-label>
+              <mat-label>{{ 'general.content' | translate }}</mat-label>
               <input
                 matInput
                 [formControl]="form.metadata.controls.contentType"
@@ -130,7 +132,7 @@ <h1 mat-dialog-title>
           <mat-form-field
             *ngIf="form.metadata.controls.endpointDocumentation; let ctrl"
             class="grow">
-            <mat-label>Endpoint Documentation</mat-label>
+            <mat-label>{{ 'general.endpoint_doc' | translate }}</mat-label>
             <input placeholder="https://" matInput [formControl]="ctrl" />
             <button
               class="!scale-[0.9]"
@@ -149,7 +151,7 @@ <h1 mat-dialog-title>
             <mat-form-field
               *ngIf="form.metadata.controls.publisher; let ctrl"
               class="grow">
-              <mat-label>Publisher</mat-label>
+              <mat-label>{{ 'general.publisher' | translate }}</mat-label>
               <input placeholder="https://" matInput [formControl]="ctrl" />
               <button
                 class="!scale-[0.9]"
@@ -167,7 +169,7 @@ <h1 mat-dialog-title>
             <mat-form-field
               *ngIf="form.metadata.controls.standardLicense; let ctrl"
               class="grow">
-              <mat-label>Standard License</mat-label>
+              <mat-label>{{ 'general.st_license' | translate }}</mat-label>
               <input placeholder="https://" matInput [formControl]="ctrl" />
               <button
                 class="!scale-[0.9]"
@@ -187,7 +189,9 @@ <h1 mat-dialog-title>
     <!-- Step: Advanced -->
     <mat-step *ngIf="form.advanced" [stepControl]="form.advanced">
       <form [formGroup]="form.advanced">
-        <ng-template matStepLabel>Advanced Information</ng-template>
+        <ng-template matStepLabel>{{
+          'general.ad_inf' | translate
+        }}</ng-template>
         <div class="flex flex-col mt-[10px]">
           <div class="flex flex-row space-x-[10px]">
             <!-- Data Category -->
@@ -514,13 +518,17 @@ <h1 mat-dialog-title>
     <!-- Step: Datasource -->
     <mat-step *ngIf="form.datasource" [stepControl]="form.datasource">
       <form [formGroup]="form.datasource">
-        <ng-template matStepLabel>Datasource Information</ng-template>
-        <div class="form-section-title">Datasource</div>
+        <ng-template matStepLabel>{{
+          'asset_list_page.datasource_info' | translate
+        }}</ng-template>
+        <div class="form-section-title">
+          {{ 'asset_list_page.datasource' | translate }}
+        </div>
         <div class="flex flex-col mt-[10px]">
           <!-- Data Address Type -->
           <data-address-type-select
-            label="Type"
-            [mode]="form.mode === 'EDIT' ? 'Datasink' : 'Datasource-Create'"
+            mode="Datasource-Create"
+            [label]="'general.type' | translate"
             [control]="
               form.datasource.controls.dataAddressType
             "></data-address-type-select>
@@ -532,7 +540,9 @@ <h1 mat-dialog-title>
                 form.datasource.controls.dataDestination;
               let ctrl
             ">
-            <mat-label>Custom Datasource Config (JSON)</mat-label>
+            <mat-label>{{
+              'asset_list_page.datasource_config' | translate
+            }}</mat-label>
             <textarea
               matInput
               placeholder='{"https://w3id.org/edc/v0.0.1/ns/type": "HttpData", ...}'
@@ -590,11 +600,12 @@ <h1 mat-dialog-title>
 
           <!-- Data Source Type HTTP -->
           <ng-container *ngIf="form.dataAddressType === 'Http'">
-            <div class="form-section-title">Method</div>
+            <div class="form-section-title">
+              {{ 'general.method' | translate }}
+            </div>
 
             <div *ngIf="form.proxyMethod" class="mb-[10px] px-[3px] text-sm">
-              The consuming side <b>must</b> provide a Custom HTTP Method with
-              method parameterization enabled.
+              {{ 'asset_list_page.provide' | translate }}
             </div>
 
             <!-- Method (Rest-Api) -->
@@ -602,7 +613,8 @@ <h1 mat-dialog-title>
               <mat-form-field
                 *ngIf="form.datasource.controls.httpMethod; let ctrl">
                 <mat-label>
-                  {{ form.proxyMethod ? 'Default' : '' }} Method
+                  {{ form.proxyMethod ? 'Default' : '' }}
+                  {{ 'general.method' | translate }}
                 </mat-label>
                 <mat-select [formControl]="ctrl">
                   <mat-option *ngFor="let method of methods" [value]="method"
@@ -620,16 +632,19 @@ <h1 mat-dialog-title>
                 mat-button
                 [color]="ctrl.value ? 'warn' : 'accent'"
                 (click)="ctrl.setValue(!ctrl.value)">
-                {{ ctrl.value ? 'Disable' : 'Enable' }} Method Parameterization
+                {{
+                  ctrl.value
+                    ? ('general.disable' | translate)
+                    : ('general.enable' | translate)
+                }}
+                {{ 'asset_list_page.method_para' | translate }}
               </button>
             </div>
 
             <div class="form-section-title">URL</div>
 
             <div *ngIf="form.proxyPath" class="mb-[10px] px-[3px] text-sm">
-              The consuming side <b>must</b> provide a Custom HTTP Subpath with
-              method parameterization is enabled. The Custom HTTP Subpath will
-              be appended to the base path.
+              {{ 'asset_list_page.http_subpath' | translate }}
             </div>
 
             <!-- Base Path (Rest-Api) -->
@@ -652,12 +667,18 @@ <h1 mat-dialog-title>
                 mat-button
                 [color]="ctrl.value ? 'warn' : 'accent'"
                 (click)="ctrl.setValue(!ctrl.value)">
-                {{ ctrl.value ? 'Disable' : 'Enable' }} Path Parameterization
+                {{
+                  ctrl.value
+                    ? ('general.disable' | translate)
+                    : ('general.enable' | translate)
+                }}
+                {{ 'asset_list_page.path_para' | translate }}
               </button>
             </div>
 
             <div class="form-section-title">
-              {{ form.proxyQueryParams ? 'Default' : '' }} Query Params
+              {{ form.proxyQueryParams ? 'Default' : '' }}
+              {{ 'asset_list_page.query_para' | translate }}
             </div>
 
             <div
@@ -668,7 +689,9 @@ <h1 mat-dialog-title>
               class="flex flex-row space-x-[10px]">
               <!-- Query Param Name -->
               <mat-form-field class="w-1/3">
-                <mat-label>Query Param Name</mat-label>
+                <mat-label>{{
+                  'asset_list_page.query_name' | translate
+                }}</mat-label>
                 <input
                   matInput
                   placeholder="key"
@@ -687,7 +710,7 @@ <h1 mat-dialog-title>
 
               <!-- Query Param Value -->
               <mat-form-field class="grow">
-                <mat-label>Value</mat-label>
+                <mat-label>{{ 'general.value' | translate }}</mat-label>
                 <input
                   matInput
                   placeholder="..."
@@ -708,16 +731,14 @@ <h1 mat-dialog-title>
                 color="warn"
                 style="height: 54px; margin-top: 4px; margin-left: 8px"
                 (click)="form.onHttpQueryParamsRemoveClick(i)">
-                Remove
+                {{ 'general.remove' | translate }}
               </button>
             </div>
 
             <div
               *ngIf="form.proxyQueryParams"
               class="text-sm mb-[10px] px-[3px]">
-              With query param parameterization enabled, the default query
-              params and the query params provided by the consumer will be
-              merged.
+              {{ 'asset_list_page.default_query' | translate }}
             </div>
 
             <div class="flex flex-row mb-[10px] space-x-[10px]">
@@ -726,7 +747,9 @@ <h1 mat-dialog-title>
                 mat-button
                 color="accent"
                 (click)="form.onHttpQueryParamsAddClick()">
-                Add {{ form.proxyQueryParams ? 'Default' : '' }} Query Param
+                {{ 'general.add' | translate }}
+                {{ form.proxyQueryParams ? 'Default' : '' }}
+                {{ 'asset_list_page.query_para_single' | translate }}
               </button>
 
               <!-- Toggle Proxy Query Param Parameterization Button -->
@@ -735,16 +758,22 @@ <h1 mat-dialog-title>
                 mat-button
                 [color]="ctrl.value ? 'warn' : 'accent'"
                 (click)="ctrl.setValue(!ctrl.value)">
-                {{ ctrl.value ? 'Disable' : 'Enable' }} Query Param
+                {{
+                  ctrl.value
+                    ? ('general.disable' | translate)
+                    : ('general.enable' | translate)
+                }}
+                {{ 'asset_list_page.query_para_single' | translate }}
                 Parameterization
               </button>
             </div>
 
-            <div class="form-section-title">Request Body</div>
+            <div class="form-section-title">
+              {{ 'asset_list_page.request_body' | translate }}
+            </div>
 
             <div class="text-sm mb-[10px] px-[3px]">
-              The request body can only be set from the consumer side, if
-              parameterization is enabled.
+              {{ 'asset_list_page.info_body' | translate }}
             </div>
 
             <!-- Toggle Proxy Body Button -->
@@ -755,12 +784,18 @@ <h1 mat-dialog-title>
                 mat-button
                 [color]="ctrl.value ? 'warn' : 'accent'"
                 (click)="ctrl.setValue(!ctrl.value)">
-                {{ ctrl.value ? 'Disable' : 'Enable' }} Request Body
-                Parameterization
+                {{
+                  ctrl.value
+                    ? ('general.disable' | translate)
+                    : ('general.enable' | translate)
+                }}
+                {{ 'asset_list_page.request_para' | translate }}
               </button>
             </div>
 
-            <div class="form-section-title">Authentication</div>
+            <div class="form-section-title">
+              {{ 'general.auth' | translate }}
+            </div>
 
             <!-- Add Authentication Button -->
             <div
@@ -776,7 +811,7 @@ <h1 mat-dialog-title>
                     'Vault-Secret'
                   )
                 ">
-                Add Authentication
+                {{ 'general.add_auth' | translate }}
               </button>
             </div>
 
@@ -790,9 +825,11 @@ <h1 mat-dialog-title>
               <mat-select
                 [formControl]="form.datasource.controls.httpAuthHeaderType">
                 <mat-option value="Vault-Secret">
-                  Header with Vault Secret
+                  {{ 'general.header_sec' | translate }}
                 </mat-option>
-                <mat-option value="Value">Header with Value</mat-option>
+                <mat-option value="Value">{{
+                  'general.header_val' | translate
+                }}</mat-option>
               </mat-select>
             </mat-form-field>
             <div
@@ -802,7 +839,7 @@ <h1 mat-dialog-title>
               class="flex flex-row space-x-[10px]">
               <!-- Auth Header Name -->
               <mat-form-field class="w-1/3">
-                <mat-label>Auth Header Name</mat-label>
+                <mat-label>{{ 'general.auth_header' | translate }}</mat-label>
                 <input
                   matInput
                   placeholder="Authorization"
@@ -816,7 +853,7 @@ <h1 mat-dialog-title>
                   form.datasource.controls.httpAuthHeaderType.value === 'Value'
                 "
                 class="grow">
-                <mat-label>Auth Header Value</mat-label>
+                <mat-label>{{ 'general.auth_value' | translate }}</mat-label>
                 <input
                   matInput
                   placeholder="Bearer ..."
@@ -832,7 +869,7 @@ <h1 mat-dialog-title>
                   'Vault-Secret'
                 "
                 class="grow">
-                <mat-label>Vault Secret Name</mat-label>
+                <mat-label>{{ 'general.vault_secret' | translate }}</mat-label>
                 <input
                   matInput
                   placeholder="MySecret123"
@@ -854,11 +891,13 @@ <h1 mat-dialog-title>
                 (click)="
                   form.datasource.controls.httpAuthHeaderType.setValue('None')
                 ">
-                Remove Authentication
+                {{ 'general.rem_auth' | translate }}
               </button>
             </div>
 
-            <div class="form-section-title">Additional Headers</div>
+            <div class="form-section-title">
+              {{ 'general.add_header' | translate }}
+            </div>
 
             <div
               *ngFor="
@@ -868,7 +907,7 @@ <h1 mat-dialog-title>
               class="flex flex-row space-x-[10px]">
               <!-- Header Name -->
               <mat-form-field class="w-1/3">
-                <mat-label>Header Name</mat-label>
+                <mat-label>{{ 'general.header_name' | translate }}</mat-label>
                 <input
                   matInput
                   placeholder="Header"
@@ -878,7 +917,7 @@ <h1 mat-dialog-title>
 
               <!-- Header Value -->
               <mat-form-field class="grow">
-                <mat-label>Header Value</mat-label>
+                <mat-label>{{ 'general.header_value' | translate }}</mat-label>
                 <input
                   matInput
                   placeholder="..."
@@ -892,7 +931,7 @@ <h1 mat-dialog-title>
                 color="warn"
                 style="height: 54px; margin-top: 4px; margin-left: 8px"
                 (click)="form.onHttpHeadersRemoveClick(i)">
-                Remove
+                {{ 'general.remove' | translate }}
               </button>
             </div>
 
@@ -902,7 +941,7 @@ <h1 mat-dialog-title>
                 mat-button
                 color="accent"
                 (click)="form.onHttpHeadersAddClick()">
-                Add Additional Header
+                {{ 'general.add_add_header' | translate }}
               </button>
             </div>
           </ng-container>
@@ -918,7 +957,7 @@ <h1 mat-dialog-title>
     color="default"
     [mat-dialog-close]="null"
     [disabled]="loading">
-    Cancel
+    {{ 'general.cancel' | translate }}
   </button>
 
   <button
@@ -926,6 +965,6 @@ <h1 mat-dialog-title>
     color="primary"
     [disabled]="!form.all.valid || loading"
     (click)="onSave()">
-    {{ form.mode === 'CREATE' ? 'Create' : 'Update' }}
+    {{ 'general.create' | translate }}
   </button>
 </mat-dialog-actions>
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog.component.ts b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog.component.ts
similarity index 65%
rename from src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog.component.ts
rename to src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog.component.ts
index b4a73ad6f..4af0aa3a8 100644
--- a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog.component.ts
+++ b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog.component.ts
@@ -8,27 +8,27 @@ import {AssetRequestBuilderLegacy} from '../../../../core/services/asset-request
 import {AssetService} from '../../../../core/services/asset.service';
 import {NotificationService} from '../../../../core/services/notification.service';
 import {ValidationMessages} from '../../../../core/validators/validation-messages';
-import {AssetEditDialogData} from './asset-edit-dialog-data';
-import {AssetEditDialogResult} from './asset-edit-dialog-result';
+import {AssetCreateDialogData} from './asset-create-dialog-data';
+import {AssetCreateDialogResult} from './asset-create-dialog-result';
 import {AssetAdvancedFormBuilder} from './form/asset-advanced-form-builder';
+import {AssetCreateDialogForm} from './form/asset-create-dialog-form';
 import {AssetDatasourceFormBuilder} from './form/asset-datasource-form-builder';
-import {AssetEditDialogForm} from './form/asset-edit-dialog-form';
 import {AssetMetadataFormBuilder} from './form/asset-metadata-form-builder';
 import {DATA_SOURCE_HTTP_METHODS} from './form/http-methods';
-import {AssetEditorDialogFormValue} from './form/model/asset-editor-dialog-form-model';
+import {AssetCreateDialogFormValue} from './form/model/asset-create-dialog-form-model';
 
 @Component({
-  selector: 'asset-edit-dialog',
-  templateUrl: './asset-edit-dialog.component.html',
+  selector: 'asset-create-dialog',
+  templateUrl: './asset-create-dialog.component.html',
   providers: [
     AssetAdvancedFormBuilder,
     AssetDatasourceFormBuilder,
-    AssetEditDialogForm,
+    AssetCreateDialogForm,
     AssetRequestBuilderLegacy,
     AssetMetadataFormBuilder,
   ],
 })
-export class AssetEditDialogComponent implements OnDestroy {
+export class AssetCreateDialogComponent implements OnDestroy {
   loading = false;
 
   methods = DATA_SOURCE_HTTP_METHODS;
@@ -36,12 +36,12 @@ export class AssetEditDialogComponent implements OnDestroy {
   constructor(
     private edcApiService: EdcApiService,
     private assetService: AssetService,
-    public form: AssetEditDialogForm,
+    public form: AssetCreateDialogForm,
     public validationMessages: ValidationMessages,
     private assetEntryBuilder: AssetRequestBuilderLegacy,
     private notificationService: NotificationService,
-    private dialogRef: MatDialogRef<AssetEditDialogComponent>,
-    @Inject(MAT_DIALOG_DATA) private data: AssetEditDialogData,
+    private dialogRef: MatDialogRef<AssetCreateDialogComponent>,
+    @Inject(MAT_DIALOG_DATA) private data: AssetCreateDialogData,
   ) {
     this.form.reset(this.data.initialFormValue);
   }
@@ -49,11 +49,6 @@ export class AssetEditDialogComponent implements OnDestroy {
   onSave() {
     const formValue = this.form.value;
 
-    // Workaround around disabled controls not being included in the form value
-    if (formValue.mode !== 'CREATE') {
-      formValue.metadata!.id = this.form.metadata.controls.id.getRawValue();
-    }
-
     this.form.all.disable();
     this.loading = true;
     this._saveRequest(formValue)
@@ -71,7 +66,7 @@ export class AssetEditDialogComponent implements OnDestroy {
         }),
         switchMap(() => this.assetService.fetchAssets()),
         map(
-          (assets): AssetEditDialogResult => ({
+          (assets): AssetCreateDialogResult => ({
             refreshedList: assets,
             asset: assets?.find(
               (it) => it.assetId === this.form.value.metadata?.id,
@@ -83,7 +78,7 @@ export class AssetEditDialogComponent implements OnDestroy {
         }),
       )
       .subscribe({
-        next: (result: AssetEditDialogResult) => this.close(result),
+        next: (result: AssetCreateDialogResult) => this.close(result),
         error: (error) => {
           console.error('Failed refreshing asset list!', error);
           this.notificationService.showError('Failed refreshing asset list!');
@@ -92,27 +87,14 @@ export class AssetEditDialogComponent implements OnDestroy {
   }
 
   private _saveRequest(
-    formValue: AssetEditorDialogFormValue,
+    formValue: AssetCreateDialogFormValue,
   ): Observable<IdResponseDto> {
-    const mode = formValue.mode;
-
-    if (mode === 'CREATE') {
-      const createRequest =
-        this.assetEntryBuilder.buildAssetCreateRequestLegacy(formValue);
-      return this.edcApiService.createAsset(createRequest);
-    }
-
-    if (mode === 'EDIT') {
-      const assetId = formValue.metadata?.id!;
-      const editRequest =
-        this.assetEntryBuilder.buildAssetEditRequestLegacy(formValue);
-      return this.edcApiService.editAsset(assetId, editRequest);
-    }
-
-    throw new Error(`Unsupported mode: ${mode}`);
+    const createRequest =
+      this.assetEntryBuilder.buildAssetCreateRequestLegacy(formValue);
+    return this.edcApiService.createAsset(createRequest);
   }
 
-  private close(params: AssetEditDialogResult) {
+  private close(params: AssetCreateDialogResult) {
     this.dialogRef.close(params);
   }
 
diff --git a/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog.service.ts b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog.service.ts
new file mode 100644
index 000000000..aa35307d8
--- /dev/null
+++ b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog.service.ts
@@ -0,0 +1,35 @@
+import {Injectable} from '@angular/core';
+import {MatDialog} from '@angular/material/dialog';
+import {NEVER, Observable} from 'rxjs';
+import {showDialogUntil} from '../../../../core/utils/mat-dialog-utils';
+import {AssetCreateDialogData} from './asset-create-dialog-data';
+import {AssetCreateDialogResult} from './asset-create-dialog-result';
+import {AssetCreateDialogComponent} from './asset-create-dialog.component';
+import {AssetCreateDialogFormMapper} from './form/asset-create-dialog-form-mapper';
+
+@Injectable()
+export class AssetCreateDialogService {
+  constructor(
+    private dialog: MatDialog,
+    private assetCreateDialogFormMapper: AssetCreateDialogFormMapper,
+  ) {}
+
+  showCreateDialog(
+    until$: Observable<any> = NEVER,
+  ): Observable<AssetCreateDialogResult | undefined> {
+    const initialFormValue = this.assetCreateDialogFormMapper.forCreate();
+    return this._open({initialFormValue}, until$);
+  }
+
+  private _open(
+    data: AssetCreateDialogData,
+    until$: Observable<any>,
+  ): Observable<AssetCreateDialogResult | undefined> {
+    return showDialogUntil(
+      this.dialog,
+      AssetCreateDialogComponent,
+      {data},
+      until$,
+    );
+  }
+}
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/assets-id-validator-builder.ts b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/assets-id-validator-builder.ts
similarity index 100%
rename from src/app/routes/connector-ui/asset-page/asset-edit-dialog/assets-id-validator-builder.ts
rename to src/app/routes/connector-ui/asset-list-page/asset-create-dialog/assets-id-validator-builder.ts
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/asset-advanced-form-builder.ts b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/asset-advanced-form-builder.ts
similarity index 94%
rename from src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/asset-advanced-form-builder.ts
rename to src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/asset-advanced-form-builder.ts
index 3c5df5bdf..a3ae32035 100644
--- a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/asset-advanced-form-builder.ts
+++ b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/asset-advanced-form-builder.ts
@@ -3,14 +3,14 @@ import {FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms';
 import {urlValidator} from 'src/app/core/validators/url-validator';
 import {validOptionalDateRange} from 'src/app/core/validators/valid-optional-date-range';
 import {AssetAdvancedFormModel} from './model/asset-advanced-form-model';
-import {AssetEditorDialogFormValue} from './model/asset-editor-dialog-form-model';
+import {AssetCreateDialogFormValue} from './model/asset-create-dialog-form-model';
 
 @Injectable()
 export class AssetAdvancedFormBuilder {
   constructor(private formBuilder: FormBuilder) {}
 
   buildFormGroup(
-    initial: AssetEditorDialogFormValue['advanced'],
+    initial: AssetCreateDialogFormValue['advanced'],
   ): FormGroup<AssetAdvancedFormModel> {
     return this.formBuilder.nonNullable.group({
       dataModel: initial?.dataModel!,
diff --git a/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/asset-create-dialog-form-mapper.ts b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/asset-create-dialog-form-mapper.ts
new file mode 100644
index 000000000..8ed74aa76
--- /dev/null
+++ b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/asset-create-dialog-form-mapper.ts
@@ -0,0 +1,60 @@
+import {Injectable} from '@angular/core';
+import {LanguageSelectItemService} from '../../../../../shared/form-elements/language-select/language-select-item.service';
+import {AssetCreateDialogFormValue} from './model/asset-create-dialog-form-model';
+import {AssetDatasourceFormValue} from './model/asset-datasource-form-model';
+
+/**
+ * Handles AngularForms for AssetCreateDialog
+ */
+@Injectable()
+export class AssetCreateDialogFormMapper {
+  constructor(private languageSelectItemService: LanguageSelectItemService) {}
+
+  forCreate(): AssetCreateDialogFormValue {
+    return {
+      metadata: {
+        id: '',
+        title: '',
+        version: '',
+        contentType: '',
+        description: '',
+        keywords: [],
+        language: this.languageSelectItemService.english(),
+        publisher: '',
+        standardLicense: '',
+        endpointDocumentation: '',
+      },
+      advanced: {
+        dataModel: '',
+        dataCategory: null,
+        dataSubcategory: null,
+        transportMode: null,
+        geoReferenceMethod: '',
+      },
+      datasource: this.emptyHttpDatasource(),
+    };
+  }
+
+  private emptyHttpDatasource(): AssetDatasourceFormValue {
+    return {
+      dataAddressType: 'Http',
+      dataDestination: '',
+
+      httpUrl: '',
+      httpMethod: 'GET',
+      httpAuthHeaderType: 'None',
+      httpAuthHeaderName: '',
+      httpAuthHeaderValue: '',
+      httpAuthHeaderSecretName: '',
+      httpQueryParams: [],
+
+      httpDefaultPath: '',
+      httpProxyMethod: false,
+      httpProxyPath: false,
+      httpProxyQueryParams: false,
+      httpProxyBody: false,
+
+      httpHeaders: [],
+    };
+  }
+}
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/asset-edit-dialog-form.ts b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/asset-create-dialog-form.ts
similarity index 73%
rename from src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/asset-edit-dialog-form.ts
rename to src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/asset-create-dialog-form.ts
index 2ca953ccf..438976f3f 100644
--- a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/asset-edit-dialog-form.ts
+++ b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/asset-create-dialog-form.ts
@@ -1,41 +1,40 @@
 import {Injectable} from '@angular/core';
 import {FormBuilder, FormGroup} from '@angular/forms';
-import {DataAddressType} from '../../../../../component-library/data-address/data-address-type-select/data-address-type';
 import {ActiveFeatureSet} from '../../../../../core/config/active-feature-set';
-import {DataCategorySelectItem} from '../../data-category-select/data-category-select-item';
-import {AssetEditDialogMode} from '../asset-edit-dialog-mode';
+import {DataAddressType} from '../../../../../shared/form-elements/data-address-type-select/data-address-type';
+import {DataCategorySelectItem} from '../../../../../shared/form-elements/data-category-select/data-category-select-item';
 import {AssetAdvancedFormBuilder} from './asset-advanced-form-builder';
 import {AssetDatasourceFormBuilder} from './asset-datasource-form-builder';
 import {AssetMetadataFormBuilder} from './asset-metadata-form-builder';
 import {AssetAdvancedFormModel} from './model/asset-advanced-form-model';
-import {AssetDatasourceFormModel} from './model/asset-datasource-form-model';
 import {
-  AssetEditorDialogFormModel,
-  AssetEditorDialogFormValue,
-} from './model/asset-editor-dialog-form-model';
+  AssetCreateDialogFormModel,
+  AssetCreateDialogFormValue,
+} from './model/asset-create-dialog-form-model';
+import {AssetDatasourceFormModel} from './model/asset-datasource-form-model';
 import {AssetMetadataFormModel} from './model/asset-metadata-form-model';
 
 /**
- * Handles AngularForms for AssetEditorDialog
+ * Handles AngularForms for AssetCreateDialog
  */
 @Injectable()
-export class AssetEditDialogForm {
-  all!: FormGroup<AssetEditorDialogFormModel>;
+export class AssetCreateDialogForm {
+  all!: FormGroup<AssetCreateDialogFormModel>;
 
   /**
    * FormGroup for stepper step "Metadata"
    */
-  metadata!: AssetEditorDialogFormModel['metadata'];
+  metadata!: AssetCreateDialogFormModel['metadata'];
 
   /**
    * FormGroup for stepper step "Advanced"
    */
-  advanced!: AssetEditorDialogFormModel['advanced'];
+  advanced!: AssetCreateDialogFormModel['advanced'];
 
   /**
    * FormGroup for stepper step "Data Source"
    */
-  datasource!: AssetEditorDialogFormModel['datasource'];
+  datasource!: AssetCreateDialogFormModel['datasource'];
 
   /**
    * Quick access to selected data address type
@@ -51,17 +50,10 @@ export class AssetEditDialogForm {
     return this.advanced!.controls.dataCategory.value;
   }
 
-  /**
-   * Quick Access to Dialog Mode
-   */
-  get mode(): AssetEditDialogMode {
-    return this.all.controls.mode.value;
-  }
-
   /**
    * Quick access to full value
    */
-  get value(): AssetEditorDialogFormValue {
+  get value(): AssetCreateDialogFormValue {
     return this.all.value;
   }
 
@@ -85,7 +77,7 @@ export class AssetEditDialogForm {
     private assetDatasourceFormBuilder: AssetDatasourceFormBuilder,
   ) {}
 
-  reset(initial: AssetEditorDialogFormValue) {
+  reset(initial: AssetCreateDialogFormValue) {
     this.all = this.buildFormGroup(initial);
     this.metadata = this.all.controls.metadata;
     this.advanced = this.all.controls.advanced;
@@ -93,18 +85,18 @@ export class AssetEditDialogForm {
   }
 
   buildFormGroup(
-    initial: AssetEditorDialogFormValue,
-  ): FormGroup<AssetEditorDialogFormModel> {
+    initial: AssetCreateDialogFormValue,
+  ): FormGroup<AssetCreateDialogFormModel> {
     const metadata: FormGroup<AssetMetadataFormModel> =
-      this.assetMetadataFormBuilder.buildFormGroup(
-        initial.metadata!,
-        initial.mode!,
-      );
+      this.assetMetadataFormBuilder.buildFormGroup(initial.metadata!);
+
+    const datasource: FormGroup<AssetDatasourceFormModel> =
+      this.assetDatasourceFormBuilder.buildFormGroup(initial.datasource!);
 
-    const formGroup: FormGroup<AssetEditorDialogFormModel> =
+    const formGroup: FormGroup<AssetCreateDialogFormModel> =
       this.formBuilder.nonNullable.group({
-        mode: [initial.mode as AssetEditDialogMode],
         metadata,
+        datasource,
       });
 
     if (this.activeFeatureSet.hasMdsFields()) {
@@ -113,12 +105,6 @@ export class AssetEditDialogForm {
       formGroup.addControl('advanced', advanced);
     }
 
-    if (initial.mode !== 'EDIT') {
-      const datasource: FormGroup<AssetDatasourceFormModel> =
-        this.assetDatasourceFormBuilder.buildFormGroup(initial.datasource!);
-      formGroup.addControl('datasource', datasource);
-    }
-
     return formGroup;
   }
 
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/asset-datasource-form-builder.ts b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/asset-datasource-form-builder.ts
similarity index 100%
rename from src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/asset-datasource-form-builder.ts
rename to src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/asset-datasource-form-builder.ts
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/asset-metadata-form-builder.ts b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/asset-metadata-form-builder.ts
similarity index 89%
rename from src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/asset-metadata-form-builder.ts
rename to src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/asset-metadata-form-builder.ts
index 573355703..d4021e297 100644
--- a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/asset-metadata-form-builder.ts
+++ b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/asset-metadata-form-builder.ts
@@ -5,7 +5,6 @@ import {map} from 'rxjs/operators';
 import {value$} from '../../../../../core/utils/form-group-utils';
 import {noWhitespacesOrColonsValidator} from '../../../../../core/validators/no-whitespaces-or-colons-validator';
 import {urlValidator} from '../../../../../core/validators/url-validator';
-import {AssetEditDialogMode} from '../asset-edit-dialog-mode';
 import {AssetsIdValidatorBuilder} from '../assets-id-validator-builder';
 import {
   AssetMetadataFormModel,
@@ -21,7 +20,6 @@ export class AssetMetadataFormBuilder {
 
   buildFormGroup(
     initial: AssetMetadataFormValue,
-    mode: AssetEditDialogMode,
   ): FormGroup<AssetMetadataFormModel> {
     const metadata: FormGroup<AssetMetadataFormModel> =
       this.formBuilder.nonNullable.group({
@@ -42,15 +40,11 @@ export class AssetMetadataFormBuilder {
       });
 
     // generate id from name and version(if available)
-    if (mode === 'CREATE') {
-      this.initIdGeneration(
-        metadata.controls.id,
-        metadata.controls.title,
-        metadata.controls.version,
-      );
-    } else {
-      metadata.controls.id.disable();
-    }
+    this.initIdGeneration(
+      metadata.controls.id,
+      metadata.controls.title,
+      metadata.controls.version,
+    );
 
     return metadata;
   }
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/form/http-methods.ts b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/http-methods.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form/form/http-methods.ts
rename to src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/http-methods.ts
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/asset-advanced-form-model.ts b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/asset-advanced-form-model.ts
similarity index 67%
rename from src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/asset-advanced-form-model.ts
rename to src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/asset-advanced-form-model.ts
index 6dd62daba..8776f2fcb 100644
--- a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/asset-advanced-form-model.ts
+++ b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/asset-advanced-form-model.ts
@@ -4,13 +4,13 @@ import {
   FormGroup,
   ɵFormGroupValue,
 } from '@angular/forms';
-import {DataCategorySelectItem} from '../../../data-category-select/data-category-select-item';
-import {DataSubcategorySelectItem} from '../../../data-subcategory-select/data-subcategory-select-item';
-import {TransportModeSelectItem} from '../../../transport-mode-select/transport-mode-select-item';
+import {DataCategorySelectItem} from '../../../../../../shared/form-elements/data-category-select/data-category-select-item';
+import {DataSubcategorySelectItem} from '../../../../../../shared/form-elements/data-subcategory-select/data-subcategory-select-item';
+import {TransportModeSelectItem} from '../../../../../../shared/form-elements/transport-mode-select/transport-mode-select-item';
 import {TemporalCoverageFormModel} from './temporal-coverage-form-model';
 
 /**
- * Form Model for AssetEditorDialog > Advanced
+ * Form Model for AssetCreateDialog > Advanced
  * (MDS Properties)
  */
 export interface AssetAdvancedFormModel {
@@ -31,6 +31,6 @@ export interface AssetAdvancedFormModel {
 }
 
 /**
- * Form Value for AssetEditorDialog > Advanced
+ * Form Value for AssetCreateDialog > Advanced
  */
 export type AssetAdvancedFormValue = ɵFormGroupValue<AssetAdvancedFormModel>;
diff --git a/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/asset-create-dialog-form-model.ts b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/asset-create-dialog-form-model.ts
new file mode 100644
index 000000000..4a60ec3f3
--- /dev/null
+++ b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/asset-create-dialog-form-model.ts
@@ -0,0 +1,19 @@
+import {FormGroup, ɵFormGroupValue} from '@angular/forms';
+import {AssetAdvancedFormModel} from './asset-advanced-form-model';
+import {AssetDatasourceFormModel} from './asset-datasource-form-model';
+import {AssetMetadataFormModel} from './asset-metadata-form-model';
+
+/**
+ * Form Model for AssetCreateDialog
+ */
+export interface AssetCreateDialogFormModel {
+  metadata: FormGroup<AssetMetadataFormModel>;
+  datasource: FormGroup<AssetDatasourceFormModel>;
+  advanced?: FormGroup<AssetAdvancedFormModel>;
+}
+
+/**
+ * Form Value for AssetCreateDialog
+ */
+export type AssetCreateDialogFormValue =
+  ɵFormGroupValue<AssetCreateDialogFormModel>;
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/asset-datasource-form-enabled-ctrls.ts b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/asset-datasource-form-enabled-ctrls.ts
similarity index 100%
rename from src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/asset-datasource-form-enabled-ctrls.ts
rename to src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/asset-datasource-form-enabled-ctrls.ts
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/asset-datasource-form-model.ts b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/asset-datasource-form-model.ts
similarity index 87%
rename from src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/asset-datasource-form-model.ts
rename to src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/asset-datasource-form-model.ts
index 24b46bcfb..1626a1da4 100644
--- a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/asset-datasource-form-model.ts
+++ b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/asset-datasource-form-model.ts
@@ -5,13 +5,13 @@ import {
   ɵFormGroupValue,
 } from '@angular/forms';
 import {UiDataSourceHttpDataMethod} from '@sovity.de/edc-client';
-import {DataAddressType} from 'src/app/component-library/data-address/data-address-type-select/data-address-type';
+import {DataAddressType} from '../../../../../../shared/form-elements/data-address-type-select/data-address-type';
 import {HttpDatasourceAuthHeaderType} from './http-datasource-auth-header-type';
 import {HttpDatasourceHeaderFormModel} from './http-datasource-header-form-model';
 import {HttpDatasourceQueryParamFormModel} from './http-datasource-query-param-form-model';
 
 /**
- * Form Model for AssetEditorDialog > Datasource
+ * Form Model for AssetCreateDialog > Datasource
  */
 export interface AssetDatasourceFormModel {
   dataAddressType: FormControl<DataAddressType>;
@@ -41,7 +41,7 @@ export interface AssetDatasourceFormModel {
 }
 
 /**
- * Form Value for AssetEditorDialog > Datasource
+ * Form Value for AssetCreateDialog > Datasource
  */
 export type AssetDatasourceFormValue =
   ɵFormGroupValue<AssetDatasourceFormModel>;
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/asset-metadata-form-model.ts b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/asset-metadata-form-model.ts
similarity index 73%
rename from src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/asset-metadata-form-model.ts
rename to src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/asset-metadata-form-model.ts
index cef83fbf2..1476396ea 100644
--- a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/asset-metadata-form-model.ts
+++ b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/asset-metadata-form-model.ts
@@ -1,8 +1,8 @@
 import {FormControl, ɵFormGroupValue} from '@angular/forms';
-import {LanguageSelectItem} from '../../../language-select/language-select-item';
+import {LanguageSelectItem} from '../../../../../../shared/form-elements/language-select/language-select-item';
 
 /**
- * Form Model for AssetEditorDialog > Metadata
+ * Form Model for AssetCreateDialog > Metadata
  */
 export interface AssetMetadataFormModel {
   id: FormControl<string>;
@@ -18,6 +18,6 @@ export interface AssetMetadataFormModel {
 }
 
 /**
- * Form Value for AssetEditorDialog > Metadata
+ * Form Value for AssetCreateDialog > Metadata
  */
 export type AssetMetadataFormValue = ɵFormGroupValue<AssetMetadataFormModel>;
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/form/model/http-datasource-auth-header-type.ts b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/http-datasource-auth-header-type.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form/form/model/http-datasource-auth-header-type.ts
rename to src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/http-datasource-auth-header-type.ts
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/http-datasource-header-form-model.ts b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/http-datasource-header-form-model.ts
similarity index 70%
rename from src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/http-datasource-header-form-model.ts
rename to src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/http-datasource-header-form-model.ts
index 784e9d096..5b0c0e694 100644
--- a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/http-datasource-header-form-model.ts
+++ b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/http-datasource-header-form-model.ts
@@ -1,7 +1,7 @@
 import {FormControl, ɵFormGroupValue} from '@angular/forms';
 
 /**
- * Form Model for AssetEditorDialog > Datasource > HTTP/REST > Header
+ * Form Model for AssetCreateDialog > Datasource > HTTP/REST > Header
  */
 export interface HttpDatasourceHeaderFormModel {
   headerName: FormControl<string>;
@@ -9,7 +9,7 @@ export interface HttpDatasourceHeaderFormModel {
 }
 
 /**
- * Form Value for AssetEditorDialog > Datasource > HTTP/REST > Header
+ * Form Value for AssetCreateDialog > Datasource > HTTP/REST > Header
  */
 export type HttpDatasourceHeaderFormValue =
   ɵFormGroupValue<HttpDatasourceHeaderFormModel>;
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/http-datasource-query-param-form-model.ts b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/http-datasource-query-param-form-model.ts
similarity index 71%
rename from src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/http-datasource-query-param-form-model.ts
rename to src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/http-datasource-query-param-form-model.ts
index 719bf5448..deb3a3bd5 100644
--- a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/http-datasource-query-param-form-model.ts
+++ b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/http-datasource-query-param-form-model.ts
@@ -1,7 +1,7 @@
 import {FormControl, ɵFormGroupValue} from '@angular/forms';
 
 /**
- * Form Model for AssetEditorDialog > Datasource > HTTP/REST > Header
+ * Form Model for AssetCreateDialog > Datasource > HTTP/REST > Header
  */
 export interface HttpDatasourceQueryParamFormModel {
   paramName: FormControl<string>;
@@ -9,7 +9,7 @@ export interface HttpDatasourceQueryParamFormModel {
 }
 
 /**
- * Form Value for AssetEditorDialog > Datasource > HTTP/REST > QueryParam
+ * Form Value for AssetCreateDialog > Datasource > HTTP/REST > QueryParam
  */
 export type HttpDatasourceQueryParamFormValue =
   ɵFormGroupValue<HttpDatasourceQueryParamFormModel>;
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/temporal-coverage-form-model.ts b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/temporal-coverage-form-model.ts
similarity index 69%
rename from src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/temporal-coverage-form-model.ts
rename to src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/temporal-coverage-form-model.ts
index f145f9f5e..0d02477e9 100644
--- a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/temporal-coverage-form-model.ts
+++ b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/form/model/temporal-coverage-form-model.ts
@@ -1,7 +1,7 @@
 import {FormControl, ɵFormGroupValue} from '@angular/forms';
 
 /**
- * Form Model for AssetEditorDialog > Advanced > Temporal Coverage
+ * Form Model for AssetCreateDialog > Advanced > Temporal Coverage
  */
 export interface TemporalCoverageFormModel {
   from: FormControl<Date | null>;
@@ -9,7 +9,7 @@ export interface TemporalCoverageFormModel {
 }
 
 /**
- * Form Value for AssetEditorDialog > Advanced > Temporal Coverage
+ * Form Value for AssetCreateDialog > Advanced > Temporal Coverage
  */
 export type TemporalCoverageFormValue =
   ɵFormGroupValue<TemporalCoverageFormModel>;
diff --git a/src/app/routes/connector-ui/asset-list-page/asset-list-page.module.ts b/src/app/routes/connector-ui/asset-list-page/asset-list-page.module.ts
new file mode 100644
index 000000000..369387622
--- /dev/null
+++ b/src/app/routes/connector-ui/asset-list-page/asset-list-page.module.ts
@@ -0,0 +1,31 @@
+import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {RouterModule} from '@angular/router';
+import {SharedModule} from '../../../shared/shared.module';
+import {AssetCardsComponent} from './asset-cards/asset-cards.component';
+import {AssetCreateDialogComponent} from './asset-create-dialog/asset-create-dialog.component';
+import {AssetCreateDialogService} from './asset-create-dialog/asset-create-dialog.service';
+import {AssetCreateDialogFormMapper} from './asset-create-dialog/form/asset-create-dialog-form-mapper';
+import {AssetListPageComponent} from './asset-list-page/asset-list-page.component';
+
+@NgModule({
+  imports: [
+    // Angular
+    CommonModule,
+    FormsModule,
+    ReactiveFormsModule,
+    RouterModule,
+
+    // EDC UI Modules
+    SharedModule,
+  ],
+  declarations: [
+    AssetCardsComponent,
+    AssetListPageComponent,
+    AssetCreateDialogComponent,
+  ],
+  providers: [AssetCreateDialogService, AssetCreateDialogFormMapper],
+  exports: [AssetListPageComponent],
+})
+export class AssetListPageModule {}
diff --git a/src/app/routes/connector-ui/asset-page/asset-page/asset-page.component.html b/src/app/routes/connector-ui/asset-list-page/asset-list-page/asset-list-page.component.html
similarity index 81%
rename from src/app/routes/connector-ui/asset-page/asset-page/asset-page.component.html
rename to src/app/routes/connector-ui/asset-list-page/asset-list-page/asset-list-page.component.html
index 9dfe3037b..9bcb147d8 100644
--- a/src/app/routes/connector-ui/asset-page/asset-page/asset-page.component.html
+++ b/src/app/routes/connector-ui/asset-list-page/asset-list-page/asset-list-page.component.html
@@ -1,10 +1,3 @@
-<!--
-  ~ Copyright (c) 2021-2024. sovity GmbH
-  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
-  ~ Contributors:
-  ~    - Fraunhofer FIT: Internationalization and German Localization
-  -->
-
 <div id="wrapper">
   <div class="flex flex-row !space-x-[10px] items-start">
     <!-- Search Bar -->
@@ -12,7 +5,7 @@
       class="search-form-field"
       appearance="outline"
       color="primary">
-      <mat-label>{{ 'asset_page.search_assets' | translate }}</mat-label>
+      <mat-label>{{ 'asset_list_page.search_assets' | translate }}</mat-label>
       <input matInput [(ngModel)]="searchText" (input)="onSearch()" />
       <mat-icon matPrefix>search</mat-icon>
       <button
@@ -33,7 +26,7 @@
       (click)="onCreate()">
       <div class="flex justify-center items-center h-full gap-1">
         <mat-icon class="mt-[1px]">add_circle_outline</mat-icon>
-        {{ 'asset_page.create_assets' | translate }}
+        {{ 'asset_list_page.create_asset' | translate }}
       </div>
     </button>
 
@@ -65,7 +58,7 @@
           !assetList.data.filteredAssets.length)
       "
       class="min-h-[35rem]"
-      [emptyMessage]="'asset_page.no_assets' | translate"></empty-state>
+      [emptyMessage]="'asset_list_page.no_assets' | translate"></empty-state>
   </div>
 
   <div class="flex flex-row flex-wrap">
diff --git a/src/app/routes/connector-ui/asset-page/asset-page/asset-page.component.scss b/src/app/routes/connector-ui/asset-list-page/asset-list-page/asset-list-page.component.scss
similarity index 100%
rename from src/app/routes/connector-ui/asset-page/asset-page/asset-page.component.scss
rename to src/app/routes/connector-ui/asset-list-page/asset-list-page/asset-list-page.component.scss
diff --git a/src/app/routes/connector-ui/asset-page/asset-page/asset-page.component.ts b/src/app/routes/connector-ui/asset-list-page/asset-list-page/asset-list-page.component.ts
similarity index 74%
rename from src/app/routes/connector-ui/asset-page/asset-page/asset-page.component.ts
rename to src/app/routes/connector-ui/asset-list-page/asset-list-page/asset-list-page.component.ts
index fda6fc229..1d6827968 100644
--- a/src/app/routes/connector-ui/asset-page/asset-page/asset-page.component.ts
+++ b/src/app/routes/connector-ui/asset-list-page/asset-list-page/asset-list-page.component.ts
@@ -2,13 +2,13 @@ import {Component, OnDestroy, OnInit} from '@angular/core';
 import {Router} from '@angular/router';
 import {BehaviorSubject, Subject} from 'rxjs';
 import {filter, switchMap} from 'rxjs/operators';
-import {OnAssetEditClickFn} from '../../../../component-library/catalog/asset-detail-dialog/asset-detail-dialog-data';
-import {AssetDetailDialogDataService} from '../../../../component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.service';
-import {AssetDetailDialogService} from '../../../../component-library/catalog/asset-detail-dialog/asset-detail-dialog.service';
 import {AssetService} from '../../../../core/services/asset.service';
 import {Fetched} from '../../../../core/services/models/fetched';
 import {UiAssetMapped} from '../../../../core/services/models/ui-asset-mapped';
-import {AssetEditDialogService} from '../asset-edit-dialog/asset-edit-dialog.service';
+import {OnAssetEditClickFn} from '../../../../shared/business/asset-detail-dialog/asset-detail-dialog-data';
+import {AssetDetailDialogDataService} from '../../../../shared/business/asset-detail-dialog/asset-detail-dialog-data.service';
+import {AssetDetailDialogService} from '../../../../shared/business/asset-detail-dialog/asset-detail-dialog.service';
+import {AssetCreateDialogService} from '../asset-create-dialog/asset-create-dialog.service';
 
 export interface AssetList {
   filteredAssets: UiAssetMapped[];
@@ -16,11 +16,11 @@ export interface AssetList {
 }
 
 @Component({
-  selector: 'asset-page',
-  templateUrl: './asset-page.component.html',
-  styleUrls: ['./asset-page.component.scss'],
+  selector: 'asset-list-page',
+  templateUrl: './asset-list-page.component.html',
+  styleUrls: ['./asset-list-page.component.scss'],
 })
-export class AssetPageComponent implements OnInit, OnDestroy {
+export class AssetListPageComponent implements OnInit, OnDestroy {
   assetList: Fetched<AssetList> = Fetched.empty();
   searchText = '';
   private fetch$ = new BehaviorSubject(null);
@@ -29,7 +29,7 @@ export class AssetPageComponent implements OnInit, OnDestroy {
     private assetServiceMapped: AssetService,
     private assetDetailDialogDataService: AssetDetailDialogDataService,
     private assetDetailDialogService: AssetDetailDialogService,
-    private assetEditDialogService: AssetEditDialogService,
+    private assetCreateDialogService: AssetCreateDialogService,
     private router: Router,
   ) {}
 
@@ -62,7 +62,7 @@ export class AssetPageComponent implements OnInit, OnDestroy {
 
   onAssetClick(asset: UiAssetMapped) {
     const onAssetEditClick: OnAssetEditClickFn = (asset) => {
-      this.router.navigate(['/edit-asset', asset.assetId]);
+      this.router.navigate(['/my-assets', asset.assetId, 'edit']);
     };
 
     const buildDialogData = (asset: UiAssetMapped) =>
@@ -78,7 +78,7 @@ export class AssetPageComponent implements OnInit, OnDestroy {
   }
 
   onCreate() {
-    this.assetEditDialogService
+    this.assetCreateDialogService
       .showCreateDialog(this.ngOnDestroy$)
       .subscribe((result) => {
         if (result?.refreshedList) {
@@ -92,6 +92,7 @@ export class AssetPageComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy$ = new Subject();
+
   ngOnDestroy() {
     this.ngOnDestroy$.next(null);
     this.ngOnDestroy$.complete();
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog-data.ts b/src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog-data.ts
deleted file mode 100644
index 35e7e625d..000000000
--- a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog-data.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import {AssetEditorDialogFormValue} from './form/model/asset-editor-dialog-form-model';
-
-export interface AssetEditDialogData {
-  initialFormValue: AssetEditorDialogFormValue;
-}
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog-mode.ts b/src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog-mode.ts
deleted file mode 100644
index 829ea52c7..000000000
--- a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog-mode.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type AssetEditDialogMode = 'CREATE' | 'EDIT';
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog.service.ts b/src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog.service.ts
deleted file mode 100644
index da1dcf7ff..000000000
--- a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog.service.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import {Injectable} from '@angular/core';
-import {MatDialog} from '@angular/material/dialog';
-import {NEVER, Observable} from 'rxjs';
-import {UiAssetMapped} from '../../../../core/services/models/ui-asset-mapped';
-import {showDialogUntil} from '../../../../core/utils/mat-dialog-utils';
-import {AssetEditDialogData} from './asset-edit-dialog-data';
-import {AssetEditDialogResult} from './asset-edit-dialog-result';
-import {AssetEditDialogComponent} from './asset-edit-dialog.component';
-import {AssetEditDialogFormMapper} from './form/asset-edit-dialog-form-mapper';
-
-@Injectable()
-export class AssetEditDialogService {
-  constructor(
-    private dialog: MatDialog,
-    private assetEditDialogFormMapper: AssetEditDialogFormMapper,
-  ) {}
-
-  showCreateDialog(
-    until$: Observable<any> = NEVER,
-  ): Observable<AssetEditDialogResult | undefined> {
-    const initialFormValue = this.assetEditDialogFormMapper.forCreate();
-    return this._open({initialFormValue}, until$);
-  }
-
-  showEditDialog(
-    asset: UiAssetMapped,
-    until$: Observable<any> = NEVER,
-  ): Observable<AssetEditDialogResult | undefined> {
-    const initialFormValue = this.assetEditDialogFormMapper.forEdit(asset);
-    return this._open({initialFormValue}, until$);
-  }
-
-  private _open(
-    data: AssetEditDialogData,
-    until$: Observable<any>,
-  ): Observable<AssetEditDialogResult | undefined> {
-    return showDialogUntil(
-      this.dialog,
-      AssetEditDialogComponent,
-      {data},
-      until$,
-    );
-  }
-}
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/asset-edit-dialog-form-mapper.ts b/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/asset-edit-dialog-form-mapper.ts
deleted file mode 100644
index 8e3924784..000000000
--- a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/asset-edit-dialog-form-mapper.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import {Injectable} from '@angular/core';
-import {UiAssetMapped} from '../../../../../core/services/models/ui-asset-mapped';
-import {LanguageSelectItemService} from '../../language-select/language-select-item.service';
-import {AssetDatasourceFormValue} from './model/asset-datasource-form-model';
-import {AssetEditorDialogFormValue} from './model/asset-editor-dialog-form-model';
-
-/**
- * Handles AngularForms for AssetEditorDialog
- */
-@Injectable()
-export class AssetEditDialogFormMapper {
-  constructor(private languageSelectItemService: LanguageSelectItemService) {}
-
-  forCreate(): AssetEditorDialogFormValue {
-    return {
-      mode: 'CREATE',
-      metadata: {
-        id: '',
-        title: '',
-        version: '',
-        contentType: '',
-        description: '',
-        keywords: [],
-        language: this.languageSelectItemService.english(),
-        publisher: '',
-        standardLicense: '',
-        endpointDocumentation: '',
-      },
-      advanced: {
-        dataModel: '',
-        dataCategory: null,
-        dataSubcategory: null,
-        transportMode: null,
-        geoReferenceMethod: '',
-      },
-      datasource: this.emptyHttpDatasource(),
-    };
-  }
-
-  forEdit(asset: UiAssetMapped): AssetEditorDialogFormValue {
-    return {
-      mode: 'EDIT',
-      metadata: {
-        id: asset.assetId,
-        title: asset.title,
-        version: asset.version,
-        contentType: asset.mediaType,
-        description: asset.description,
-        keywords: asset.keywords,
-        language: asset.language,
-        publisher: asset.publisherHomepage,
-        standardLicense: asset.licenseUrl,
-        endpointDocumentation: asset.landingPageUrl,
-      },
-      advanced: {
-        dataModel: asset.dataModel,
-        dataCategory: asset.dataCategory,
-        dataSubcategory: asset.dataSubcategory,
-        transportMode: asset.transportMode,
-        geoReferenceMethod: asset.geoReferenceMethod,
-        sovereignLegalName: asset.sovereignLegalName,
-        geoLocation: asset.geoLocation,
-        nutsLocations: asset.nutsLocations,
-        dataSampleUrls: asset.dataSampleUrls,
-        referenceFileUrls: asset.referenceFileUrls,
-        referenceFilesDescription: asset.referenceFilesDescription,
-        conditionsForUse: asset.conditionsForUse,
-        dataUpdateFrequency: asset.dataUpdateFrequency,
-        temporalCoverage: {
-          from: asset.temporalCoverageFrom,
-          toInclusive: asset.temporalCoverageToInclusive,
-        },
-      },
-      datasource: this.emptyEditDatasource(),
-    };
-  }
-
-  private emptyHttpDatasource(): AssetDatasourceFormValue {
-    return {
-      dataAddressType: 'Http',
-      dataDestination: '',
-
-      httpUrl: '',
-      httpMethod: 'GET',
-      httpAuthHeaderType: 'None',
-      httpAuthHeaderName: '',
-      httpAuthHeaderValue: '',
-      httpAuthHeaderSecretName: '',
-      httpQueryParams: [],
-
-      httpDefaultPath: '',
-      httpProxyMethod: false,
-      httpProxyPath: false,
-      httpProxyQueryParams: false,
-      httpProxyBody: false,
-
-      httpHeaders: [],
-    };
-  }
-
-  private emptyEditDatasource(): AssetDatasourceFormValue {
-    return {
-      ...this.emptyHttpDatasource(),
-      dataAddressType: 'Unchanged',
-    };
-  }
-}
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/asset-editor-dialog-form-model.ts b/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/asset-editor-dialog-form-model.ts
deleted file mode 100644
index cbc11c372..000000000
--- a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/asset-editor-dialog-form-model.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import {FormControl, FormGroup, ɵFormGroupValue} from '@angular/forms';
-import {AssetEditDialogMode} from '../../asset-edit-dialog-mode';
-import {AssetAdvancedFormModel} from './asset-advanced-form-model';
-import {AssetDatasourceFormModel} from './asset-datasource-form-model';
-import {AssetMetadataFormModel} from './asset-metadata-form-model';
-
-/**
- * Form Model for AssetEditorDialog
- */
-export interface AssetEditorDialogFormModel {
-  mode: FormControl<AssetEditDialogMode>;
-  metadata: FormGroup<AssetMetadataFormModel>;
-  advanced?: FormGroup<AssetAdvancedFormModel>;
-  datasource?: FormGroup<AssetDatasourceFormModel>;
-}
-
-/**
- * Form Value for AssetEditorDialog
- */
-export type AssetEditorDialogFormValue =
-  ɵFormGroupValue<AssetEditorDialogFormModel>;
diff --git a/src/app/routes/connector-ui/asset-page/asset-page.module.ts b/src/app/routes/connector-ui/asset-page/asset-page.module.ts
deleted file mode 100644
index 9ed22af19..000000000
--- a/src/app/routes/connector-ui/asset-page/asset-page.module.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {MatBadgeModule} from '@angular/material/badge';
-import {MatButtonModule} from '@angular/material/button';
-import {MatCardModule} from '@angular/material/card';
-import {MatCheckboxModule} from '@angular/material/checkbox';
-import {MatChipsModule} from '@angular/material/chips';
-import {MatNativeDateModule} from '@angular/material/core';
-import {MatDatepickerModule} from '@angular/material/datepicker';
-import {MatDialogModule} from '@angular/material/dialog';
-import {MatDividerModule} from '@angular/material/divider';
-import {MatFormFieldModule} from '@angular/material/form-field';
-import {MatIconModule} from '@angular/material/icon';
-import {MatInputModule} from '@angular/material/input';
-import {MatPaginatorModule} from '@angular/material/paginator';
-import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
-import {MatSelectModule} from '@angular/material/select';
-import {MatSlideToggleModule} from '@angular/material/slide-toggle';
-import {MatStepperModule} from '@angular/material/stepper';
-import {MatTooltipModule} from '@angular/material/tooltip';
-import {RouterModule} from '@angular/router';
-import {TranslateModule} from '@ngx-translate/core';
-import {CatalogModule} from '../../../component-library/catalog/catalog.module';
-import {DataAddressModule} from '../../../component-library/data-address/data-address.module';
-import {PipesAndDirectivesModule} from '../../../component-library/pipes-and-directives/pipes-and-directives.module';
-import {UiElementsModule} from '../../../component-library/ui-elements/ui-elements.module';
-import {AssetCardsComponent} from './asset-cards/asset-cards.component';
-import {AssetEditDialogComponent} from './asset-edit-dialog/asset-edit-dialog.component';
-import {AssetEditDialogService} from './asset-edit-dialog/asset-edit-dialog.service';
-import {AssetEditDialogFormMapper} from './asset-edit-dialog/form/asset-edit-dialog-form-mapper';
-import {AssetPageComponent} from './asset-page/asset-page.component';
-import {DataCategorySelectComponent} from './data-category-select/data-category-select.component';
-import {DataSubcategoryItemsPipe} from './data-subcategory-select/data-subcategory-items.pipe';
-import {DataSubcategorySelectComponent} from './data-subcategory-select/data-subcategory-select.component';
-import {KeywordSelectComponent} from './keyword-select/keyword-select.component';
-import {LanguageSelectComponent} from './language-select/language-select.component';
-import {TransportModeSelectComponent} from './transport-mode-select/transport-mode-select.component';
-
-@NgModule({
-  imports: [
-    // Angular
-    CommonModule,
-    FormsModule,
-    ReactiveFormsModule,
-    RouterModule,
-    TranslateModule,
-    // Angular Material
-    MatBadgeModule,
-    MatButtonModule,
-    MatCardModule,
-    MatCheckboxModule,
-    MatChipsModule,
-    MatDatepickerModule,
-    MatDividerModule,
-    MatFormFieldModule,
-    MatProgressSpinnerModule,
-    MatSelectModule,
-    MatSlideToggleModule,
-    MatStepperModule,
-    MatTooltipModule,
-    MatPaginatorModule,
-    MatInputModule,
-    MatIconModule,
-    MatDialogModule,
-    MatNativeDateModule,
-
-    // EDC UI Modules
-    CatalogModule,
-    DataAddressModule,
-    PipesAndDirectivesModule,
-    UiElementsModule,
-  ],
-  declarations: [
-    AssetCardsComponent,
-    AssetPageComponent,
-    AssetEditDialogComponent,
-    DataCategorySelectComponent,
-    DataSubcategorySelectComponent,
-    DataSubcategoryItemsPipe,
-    KeywordSelectComponent,
-    LanguageSelectComponent,
-    TransportModeSelectComponent,
-  ],
-  providers: [AssetEditDialogService, AssetEditDialogFormMapper],
-  exports: [AssetPageComponent],
-})
-export class AssetPageModule {}
diff --git a/src/app/routes/connector-ui/asset-page/data-category-select/data-category-select-data.ts b/src/app/routes/connector-ui/asset-page/data-category-select/data-category-select-data.ts
deleted file mode 100644
index 611e3f020..000000000
--- a/src/app/routes/connector-ui/asset-page/data-category-select/data-category-select-data.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import {DataCategorySelectItem} from './data-category-select-item';
-
-export const DATA_CATEGORY_SELECT_DATA: DataCategorySelectItem[] = [
-  {
-    id: 'Traffic Information',
-    label: 'Traffic Information',
-  },
-  {
-    id: 'Roadworks and Road Conditions',
-    label: 'Roadworks and Road Conditions',
-  },
-  {
-    id: 'Traffic Flow Information',
-    label: 'Traffic Flow Information',
-  },
-  {
-    id: 'Parking Information',
-    label: 'Parking Information',
-  },
-  {
-    id: 'Electromobility',
-    label: 'Electromobility',
-  },
-  {
-    id: 'Traffic Signs and Speed Information',
-    label: 'Traffic Signs and Speed Information',
-  },
-  {
-    id: 'Weather Information',
-    label: 'Weather Information',
-  },
-  {
-    id: 'Public Transport Information',
-    label: 'Public Transport Information',
-  },
-  {
-    id: 'Shared and On-Demand Mobility',
-    label: 'Shared and On-Demand Mobility',
-  },
-  {
-    id: 'Infrastructure and Logistics',
-    label: 'Infrastructure and Logistics',
-  },
-  {
-    id: 'Various',
-    label: 'Various',
-  },
-];
diff --git a/src/app/routes/connector-ui/asset-page/data-category-select/data-category-select-item.service.ts b/src/app/routes/connector-ui/asset-page/data-category-select/data-category-select-item.service.ts
deleted file mode 100644
index 2a4d27614..000000000
--- a/src/app/routes/connector-ui/asset-page/data-category-select/data-category-select-item.service.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import {Injectable} from '@angular/core';
-import {DATA_CATEGORY_SELECT_DATA} from './data-category-select-data';
-import {DataCategorySelectItem} from './data-category-select-item';
-
-/**
- * Access list of available DataCategorySelectItems
- */
-@Injectable({providedIn: 'root'})
-export class DataCategorySelectItemService {
-  itemsById: Map<string, DataCategorySelectItem>;
-
-  constructor() {
-    this.itemsById = this.buildItemsMap();
-  }
-
-  /**
-   * Find DataCategorySelectItem by id
-   * @param id language select item id
-   */
-  findById(id: string): DataCategorySelectItem {
-    const item = this.itemsById.get(id);
-    if (item != null) {
-      return item;
-    }
-    return {
-      id,
-      label: id,
-    };
-  }
-
-  private buildItemsMap(): Map<string, DataCategorySelectItem> {
-    return new Map(DATA_CATEGORY_SELECT_DATA.map((it) => [it.id, it]));
-  }
-}
diff --git a/src/app/routes/connector-ui/asset-page/data-category-select/data-category-select-item.ts b/src/app/routes/connector-ui/asset-page/data-category-select/data-category-select-item.ts
deleted file mode 100644
index dbf30de59..000000000
--- a/src/app/routes/connector-ui/asset-page/data-category-select/data-category-select-item.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface DataCategorySelectItem {
-  id: string;
-  label: string;
-}
diff --git a/src/app/routes/connector-ui/asset-page/data-category-select/data-category-select.component.html b/src/app/routes/connector-ui/asset-page/data-category-select/data-category-select.component.html
deleted file mode 100644
index 9b6585a5a..000000000
--- a/src/app/routes/connector-ui/asset-page/data-category-select/data-category-select.component.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<mat-form-field class="grow form-field" color="accent">
-  <mat-label>{{ label }}</mat-label>
-  <mat-select [formControl]="control" [compareWith]="'id' | compareByField">
-    <mat-option [value]="null"></mat-option>
-    <mat-option *ngFor="let item of items" [value]="item">
-      {{ item.label }}
-    </mat-option>
-  </mat-select>
-</mat-form-field>
diff --git a/src/app/routes/connector-ui/asset-page/data-category-select/data-category-select.component.ts b/src/app/routes/connector-ui/asset-page/data-category-select/data-category-select.component.ts
deleted file mode 100644
index eff3b4595..000000000
--- a/src/app/routes/connector-ui/asset-page/data-category-select/data-category-select.component.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import {Component, HostBinding, Input} from '@angular/core';
-import {FormControl} from '@angular/forms';
-import {DATA_CATEGORY_SELECT_DATA} from './data-category-select-data';
-import {DataCategorySelectItem} from './data-category-select-item';
-
-@Component({
-  selector: 'data-category-select',
-  templateUrl: 'data-category-select.component.html',
-})
-export class DataCategorySelectComponent {
-  @Input()
-  label!: string;
-
-  @Input()
-  control!: FormControl<DataCategorySelectItem | null>;
-
-  @HostBinding('class.flex')
-  @HostBinding('class.flex-row')
-  cls = true;
-
-  items = DATA_CATEGORY_SELECT_DATA;
-}
diff --git a/src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-items.pipe.ts b/src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-items.pipe.ts
deleted file mode 100644
index 00c8b8c18..000000000
--- a/src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-items.pipe.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {Pipe, PipeTransform} from '@angular/core';
-import {DataCategorySelectItem} from '../data-category-select/data-category-select-item';
-import {DataSubcategorySelectItem} from './data-subcategory-select-item';
-import {DataSubcategorySelectItemService} from './data-subcategory-select-item.service';
-
-@Pipe({
-  name: 'dataSubcategoryItems',
-})
-export class DataSubcategoryItemsPipe implements PipeTransform {
-  constructor(private items: DataSubcategorySelectItemService) {}
-
-  transform(
-    dataCategory: DataCategorySelectItem | null,
-  ): DataSubcategorySelectItem[] {
-    return this.items.findByDataCategory(dataCategory);
-  }
-}
diff --git a/src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-select-data.ts b/src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-select-data.ts
deleted file mode 100644
index ebe31cdc8..000000000
--- a/src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-select-data.ts
+++ /dev/null
@@ -1,189 +0,0 @@
-import {DataSubcategorySelectItem} from './data-subcategory-select-item';
-
-export const DATA_SUBCATEGORY_SELECT_DATA: DataSubcategorySelectItem[] = [
-  {
-    id: 'Accidents',
-    dataCategoryId: 'Traffic Information',
-    label: 'Accidents',
-  },
-
-  {
-    id: 'Hazard Warnings',
-    dataCategoryId: 'Traffic Information',
-    label: 'Hazard Warnings',
-  },
-
-  {
-    id: 'Roadworks',
-    dataCategoryId: 'Roadworks and Road Conditions',
-    label: 'Roadworks',
-  },
-
-  {
-    id: 'Road Conditions',
-    dataCategoryId: 'Roadworks and Road Conditions',
-    label: 'Road Conditions',
-  },
-
-  {
-    id: 'Realtime Traffic Flow Data',
-    dataCategoryId: 'Traffic Flow Information',
-    label: 'Realtime Traffic Flow Data',
-  },
-
-  {
-    id: 'Forecast Traffic Flow Data',
-    dataCategoryId: 'Traffic Flow Information',
-    label: 'Forecast Traffic Flow Data',
-  },
-
-  {
-    id: 'Availability and Forecast',
-    dataCategoryId: 'Parking Information',
-    label: 'Availability and Forecast',
-  },
-
-  {
-    id: 'Prices',
-    dataCategoryId: 'Parking Information',
-    label: 'Prices',
-  },
-
-  {
-    id: 'Location of Charging Station',
-    dataCategoryId: 'Electromobility',
-    label: 'Location of Charging Station',
-  },
-
-  {
-    id: 'Prices at Charging Station',
-    dataCategoryId: 'Electromobility',
-    label: 'Prices at Charging Station',
-  },
-
-  {
-    id: 'Availability of Charging Station',
-    dataCategoryId: 'Electromobility',
-    label: 'Availability of Charging Station',
-  },
-
-  {
-    id: 'Dynamic Speed Information',
-    dataCategoryId: 'Traffic Signs and Speed Information',
-    label: 'Dynamic Speed Information',
-  },
-
-  {
-    id: 'Dynamic Traffic Signs',
-    dataCategoryId: 'Traffic Signs and Speed Information',
-    label: 'Dynamic Traffic Signs',
-  },
-
-  {
-    id: 'Static Traffic Signs',
-    dataCategoryId: 'Traffic Signs and Speed Information',
-    label: 'Static Traffic Signs',
-  },
-
-  {
-    id: 'Current Weather Conditions',
-    dataCategoryId: 'Weather Information',
-    label: 'Current weather conditions',
-  },
-
-  {
-    id: 'Weather Forecast ',
-    dataCategoryId: 'Weather Information',
-    label: 'Weather Forecast ',
-  },
-
-  {
-    id: 'Special Events or Disruptions',
-    dataCategoryId: 'Weather Information',
-    label: 'Special Events or Disruptions',
-  },
-
-  {
-    id: 'Timetables',
-    dataCategoryId: 'Public Transport Information',
-    label: 'Timetables',
-  },
-
-  {
-    id: 'Fare',
-    dataCategoryId: 'Public Transport Information',
-    label: 'Fare',
-  },
-
-  {
-    id: 'Location Information',
-    dataCategoryId: 'Public Transport Information',
-    label: 'Location Information',
-  },
-
-  {
-    id: 'Vehicle Information ',
-    dataCategoryId: 'Shared and On-Demand Mobility',
-    label: 'Vehicle information',
-  },
-
-  {
-    id: 'Availability ',
-    dataCategoryId: 'Shared and On-Demand Mobility',
-    label: 'Availability',
-  },
-
-  {
-    id: 'Location ',
-    dataCategoryId: 'Shared and On-Demand Mobility',
-    label: 'Location',
-  },
-
-  {
-    id: 'Range ',
-    dataCategoryId: 'Shared and On-Demand Mobility',
-    label: 'Range',
-  },
-
-  {
-    id: 'General Information About Planning Of Routes',
-    dataCategoryId: 'Infrastructure and Logistics',
-    label: 'General Information About Planning Of Routes',
-  },
-
-  {
-    id: 'Pedestrian Networks',
-    dataCategoryId: 'Infrastructure and Logistics',
-    label: 'Pedestrian Networks',
-  },
-
-  {
-    id: 'Cycling Networks',
-    dataCategoryId: 'Infrastructure and Logistics',
-    label: 'Cycling Networks',
-  },
-
-  {
-    id: 'Road Network',
-    dataCategoryId: 'Infrastructure and Logistics',
-    label: 'Road Network',
-  },
-
-  {
-    id: 'Water Routes',
-    dataCategoryId: 'Infrastructure and Logistics',
-    label: 'Water Routes',
-  },
-
-  {
-    id: 'Cargo Logistics',
-    dataCategoryId: 'Infrastructure and Logistics',
-    label: 'Cargo and Logistics',
-  },
-
-  {
-    id: 'Toll Information',
-    dataCategoryId: 'Infrastructure and Logistics',
-    label: 'Toll Information',
-  },
-];
diff --git a/src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-select-item.service.ts b/src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-select-item.service.ts
deleted file mode 100644
index bd38df5f2..000000000
--- a/src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-select-item.service.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import {Injectable} from '@angular/core';
-import {associateBy, groupedBy} from '../../../../core/utils/map-utils';
-import {DataCategorySelectItem} from '../data-category-select/data-category-select-item';
-import {DATA_SUBCATEGORY_SELECT_DATA} from './data-subcategory-select-data';
-import {DataSubcategorySelectItem} from './data-subcategory-select-item';
-
-/**
- * Access list of available DataSubcategorySelectItems
- */
-@Injectable({providedIn: 'root'})
-export class DataSubcategorySelectItemService {
-  itemsById = associateBy(DATA_SUBCATEGORY_SELECT_DATA, (it) => it.id);
-  itemsByDataCategory = groupedBy(
-    DATA_SUBCATEGORY_SELECT_DATA,
-    (it) => it.dataCategoryId,
-  );
-
-  /**
-   * Find DataSubcategorySelectItem by id
-   * @param id language select item id
-   */
-  findById(id: string): DataSubcategorySelectItem {
-    const item = this.itemsById.get(id);
-    if (item != null) {
-      return item;
-    }
-    return {
-      id,
-      dataCategoryId: '',
-      label: id,
-    };
-  }
-
-  /**
-   * Find DataCategorySelectItems by (parent) data category
-   */
-  findByDataCategory(
-    dataCategory: DataCategorySelectItem | null,
-  ): DataSubcategorySelectItem[] {
-    return dataCategory
-      ? this.itemsByDataCategory.get(dataCategory?.id) ?? []
-      : [];
-  }
-}
diff --git a/src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-select-item.ts b/src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-select-item.ts
deleted file mode 100644
index cef088969..000000000
--- a/src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-select-item.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface DataSubcategorySelectItem {
-  id: string;
-  dataCategoryId: string;
-  label: string;
-}
diff --git a/src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-select.component.html b/src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-select.component.html
deleted file mode 100644
index f622010ad..000000000
--- a/src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-select.component.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<mat-form-field class="grow form-field" color="accent">
-  <mat-label>{{ label }}</mat-label>
-  <mat-select [formControl]="control" [compareWith]="'id' | compareByField">
-    <mat-option [value]="null">-</mat-option>
-    <mat-option
-      *ngFor="let item of dataCategory | dataSubcategoryItems"
-      [value]="item">
-      {{ item.label }}
-    </mat-option>
-  </mat-select>
-</mat-form-field>
diff --git a/src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-select.component.ts b/src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-select.component.ts
deleted file mode 100644
index 217b9de41..000000000
--- a/src/app/routes/connector-ui/asset-page/data-subcategory-select/data-subcategory-select.component.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import {Component, HostBinding, Input} from '@angular/core';
-import {FormControl} from '@angular/forms';
-import {DataCategorySelectItem} from '../data-category-select/data-category-select-item';
-import {DataSubcategorySelectItem} from './data-subcategory-select-item';
-
-@Component({
-  selector: 'data-subcategory-select',
-  templateUrl: 'data-subcategory-select.component.html',
-})
-export class DataSubcategorySelectComponent {
-  @Input()
-  label!: string;
-
-  @Input()
-  dataCategory: DataCategorySelectItem | null = null;
-
-  @Input()
-  control!: FormControl<DataSubcategorySelectItem | null>;
-
-  @HostBinding('class.flex')
-  @HostBinding('class.flex-row')
-  cls = true;
-}
diff --git a/src/app/routes/connector-ui/asset-page/keyword-select/keyword-select.component.html b/src/app/routes/connector-ui/asset-page/keyword-select/keyword-select.component.html
deleted file mode 100644
index 0378ae612..000000000
--- a/src/app/routes/connector-ui/asset-page/keyword-select/keyword-select.component.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<mat-form-field class="grow mb-2" appearance="outline" color="accent">
-  <mat-label>{{ label }}</mat-label>
-  <mat-chip-list
-    #chipList
-    aria-label="keyword selection"
-    [formControl]="control">
-    <mat-chip
-      *ngFor="let keyword of control?.value ?? []"
-      (removed)="remove(keyword)">
-      {{ keyword }}
-      <button matChipRemove>
-        <mat-icon>{{ 'general.cancel' | translate }}</mat-icon>
-      </button>
-    </mat-chip>
-    <input
-      placeholder="{{ 'asset_page.add_keyword' | translate }}"
-      [matChipInputAddOnBlur]="true"
-      [matChipInputFor]="chipList"
-      [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
-      (matChipInputTokenEnd)="add($event)" />
-  </mat-chip-list>
-  <button
-    class="!scale-[0.9]"
-    mat-icon-button
-    matSuffix
-    matTooltip="Keywords make the data offer easier to find. They appear as tags on 'Assets' and 'Catalog Browser' pages.">
-    <mat-icon>info_outline</mat-icon>
-  </button>
-</mat-form-field>
diff --git a/src/app/routes/connector-ui/asset-page/keyword-select/keyword-select.component.ts b/src/app/routes/connector-ui/asset-page/keyword-select/keyword-select.component.ts
deleted file mode 100644
index bdfb24b83..000000000
--- a/src/app/routes/connector-ui/asset-page/keyword-select/keyword-select.component.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import {COMMA, ENTER, SEMICOLON} from '@angular/cdk/keycodes';
-import {Component, HostBinding, Input} from '@angular/core';
-import {FormControl} from '@angular/forms';
-import {MatChipInputEvent} from '@angular/material/chips';
-import {removeOnce} from '../../../../core/utils/array-utils';
-
-@Component({
-  selector: 'keyword-select',
-  templateUrl: 'keyword-select.component.html',
-})
-export class KeywordSelectComponent {
-  separatorKeysCodes: number[] = [ENTER, COMMA, SEMICOLON];
-
-  @Input()
-  label!: string;
-
-  @Input()
-  control!: FormControl<string[]>;
-
-  @HostBinding('class.flex')
-  @HostBinding('class.flex-row')
-  cls = true;
-
-  remove(keyword: string) {
-    this.control.setValue(removeOnce(this.control.value, keyword));
-  }
-
-  add(event: MatChipInputEvent): void {
-    const keywords = (event.value || '')
-      .split(/[,;]/)
-      .map((it) => it.trim())
-      .filter((it) => it);
-    if (keywords.length) {
-      this.control.setValue([...this.control.value, ...keywords]);
-    }
-    event.chipInput.clear();
-  }
-}
diff --git a/src/app/routes/connector-ui/asset-page/language-select/language-select-data.ts b/src/app/routes/connector-ui/asset-page/language-select/language-select-data.ts
deleted file mode 100644
index 79740613f..000000000
--- a/src/app/routes/connector-ui/asset-page/language-select/language-select-data.ts
+++ /dev/null
@@ -1,1299 +0,0 @@
-import {LanguageSelectItem} from './language-select-item';
-
-export const LANGUAGE_SELECT_DATA: LanguageSelectItem[] = [
-  {
-    id: 'https://w3id.org/idsa/code/MULTI_LINGUAL',
-    idShort: 'MULTI_LINGUAL',
-    label: 'Multilingual',
-    comment:
-      'Code indicates that several languages are used or no concrete language can be determined.',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/AB',
-    idShort: 'AB',
-    label: 'Abkhaz',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ab',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/AA',
-    idShort: 'AA',
-    label: 'Afar',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:aa',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/AF',
-    idShort: 'AF',
-    label: 'Afrikaans',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:af',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/AK',
-    idShort: 'AK',
-    label: 'Akan',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ak',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/SQ',
-    idShort: 'SQ',
-    label: 'Albanian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:sq',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/AM',
-    idShort: 'AM',
-    label: 'Amharic',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:am',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/AR',
-    idShort: 'AR',
-    label: 'Arabic',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ar',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/AN',
-    idShort: 'AN',
-    label: 'Aragonese',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:an',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/HY',
-    idShort: 'HY',
-    label: 'Armenian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:hy',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/AS',
-    idShort: 'AS',
-    label: 'Assamese',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:as',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/AV',
-    idShort: 'AV',
-    label: 'Avaric',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:av',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/AE',
-    idShort: 'AE',
-    label: 'Avestan',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ae',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/AY',
-    idShort: 'AY',
-    label: 'Aymara',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ay',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/AZ',
-    idShort: 'AZ',
-    label: 'Azerbaijani',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:az',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/BM',
-    idShort: 'BM',
-    label: 'Bambara',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:bm',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/BA',
-    idShort: 'BA',
-    label: 'Bashkir',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ba',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/EU',
-    idShort: 'EU',
-    label: 'Basque',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:eu',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/BE',
-    idShort: 'BE',
-    label: 'Belarusian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:be',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/BN',
-    idShort: 'BN',
-    label: 'Bengali, Bangla',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:bn',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/BH',
-    idShort: 'BH',
-    label: 'Bihari',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:bh',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/BI',
-    idShort: 'BI',
-    label: 'Bislama',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:bi',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/BS',
-    idShort: 'BS',
-    label: 'Bosnian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:bs',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/BR',
-    idShort: 'BR',
-    label: 'Breton',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:br',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/BG',
-    idShort: 'BG',
-    label: 'Bulgarian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:bg',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/MY',
-    idShort: 'MY',
-    label: 'Burmese',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:my',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/CA',
-    idShort: 'CA',
-    label: 'Catalan',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ca',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/CH',
-    idShort: 'CH',
-    label: 'Chamorro',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ch',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/CE',
-    idShort: 'CE',
-    label: 'Chechen',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ce',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/NY',
-    idShort: 'NY',
-    label: 'Chichewa, Chewa, Nyanja',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ny',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/ZH',
-    idShort: 'ZH',
-    label: 'Chinese',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:zh',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/CV',
-    idShort: 'CV',
-    label: 'Chuvash',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:cv',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/KW',
-    idShort: 'KW',
-    label: 'Cornish',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:kw',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/CO',
-    idShort: 'CO',
-    label: 'Corsican',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:co',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/CR',
-    idShort: 'CR',
-    label: 'Cree',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:cr',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/HR',
-    idShort: 'HR',
-    label: 'Croatian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:hr',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/CS',
-    idShort: 'CS',
-    label: 'Czech',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:cs',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/DA',
-    idShort: 'DA',
-    label: 'Danish',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:da',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/DV',
-    idShort: 'DV',
-    label: 'Divehi, Dhivehi, Maldivian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:dv',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/NL',
-    idShort: 'NL',
-    label: 'Dutch',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:nl',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/DZ',
-    idShort: 'DZ',
-    label: 'Dzongkha',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:dz',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/EN',
-    idShort: 'EN',
-    label: 'English',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:en',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/EO',
-    idShort: 'EO',
-    label: 'Esperanto',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:eo',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/ET',
-    idShort: 'ET',
-    label: 'Estonian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:et',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/EE',
-    idShort: 'EE',
-    label: 'Ewe',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ee',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/FO',
-    idShort: 'FO',
-    label: 'Faroese',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:fo',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/FJ',
-    idShort: 'FJ',
-    label: 'Fijian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:fj',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/FI',
-    idShort: 'FI',
-    label: 'Finnish',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:fi',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/FR',
-    idShort: 'FR',
-    label: 'French',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:fr',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/FF',
-    idShort: 'FF',
-    label: 'Fula, Fulah, Pulaar, Pular',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ff',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/GL',
-    idShort: 'GL',
-    label: 'Galician',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:gl',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/KA',
-    idShort: 'KA',
-    label: 'Georgian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ka',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/DE',
-    idShort: 'DE',
-    label: 'German',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:de',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/EL',
-    idShort: 'EL',
-    label: 'Greek (modern)',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:el',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/GN',
-    idShort: 'GN',
-    label: 'Guaraní',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:gn',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/GU',
-    idShort: 'GU',
-    label: 'Gujarati',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:gu',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/HT',
-    idShort: 'HT',
-    label: 'Haitian, Haitian Creole',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ht',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/HA',
-    idShort: 'HA',
-    label: 'Hausa',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ha',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/HE',
-    idShort: 'HE',
-    label: 'Hebrew (modern)',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:he',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/HZ',
-    idShort: 'HZ',
-    label: 'Herero',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:hz',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/HI',
-    idShort: 'HI',
-    label: 'Hindi',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:hi',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/HO',
-    idShort: 'HO',
-    label: 'Hiri Motu',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ho',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/HU',
-    idShort: 'HU',
-    label: 'Hungarian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:hu',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/IA',
-    idShort: 'IA',
-    label: 'Interlingua',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ia',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/ID',
-    idShort: 'ID',
-    label: 'Indonesian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:id',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/IE',
-    idShort: 'IE',
-    label: 'Interlingue',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ie',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/GA',
-    idShort: 'GA',
-    label: 'Irish',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ga',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/IG',
-    idShort: 'IG',
-    label: 'Igbo',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ig',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/IK',
-    idShort: 'IK',
-    label: 'Inupiaq',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ik',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/IO',
-    idShort: 'IO',
-    label: 'Ido',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:io',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/IS',
-    idShort: 'IS',
-    label: 'Icelandic',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:is',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/IT',
-    idShort: 'IT',
-    label: 'Italian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:it',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/IU',
-    idShort: 'IU',
-    label: 'Inuktitut',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:iu',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/JA',
-    idShort: 'JA',
-    label: 'Japanese',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ja',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/JV',
-    idShort: 'JV',
-    label: 'Javanese',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:jv',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/KL',
-    idShort: 'KL',
-    label: 'Kalaallisut, Greenlandic',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:kl',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/KN',
-    idShort: 'KN',
-    label: 'Kannada',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:kn',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/KR',
-    idShort: 'KR',
-    label: 'Kanuri',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:kr',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/KS',
-    idShort: 'KS',
-    label: 'Kashmiri',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ks',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/KK',
-    idShort: 'KK',
-    label: 'Kazakh',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:kk',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/KM',
-    idShort: 'KM',
-    label: 'Khmer',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:km',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/KI',
-    idShort: 'KI',
-    label: 'Kikuyu, Gikuyu',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ki',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/RW',
-    idShort: 'RW',
-    label: 'Kinyarwanda',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:rw',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/KY',
-    idShort: 'KY',
-    label: 'Kyrgyz',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ky',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/KV',
-    idShort: 'KV',
-    label: 'Komi',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:kv',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/KG',
-    idShort: 'KG',
-    label: 'Kongo',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:kg',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/KO',
-    idShort: 'KO',
-    label: 'Korean',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ko',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/KU',
-    idShort: 'KU',
-    label: 'Kurdish',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ku',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/KJ',
-    idShort: 'KJ',
-    label: 'Kwanyama, Kuanyama',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:kj',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/LA',
-    idShort: 'LA',
-    label: 'Latin',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:la',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/LB',
-    idShort: 'LB',
-    label: 'Luxembourgish, Letzeburgesch',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:lb',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/LG',
-    idShort: 'LG',
-    label: 'Ganda',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:lg',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/LI',
-    idShort: 'LI',
-    label: 'Limburgish, Limburgan, Limburger',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:li',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/LN',
-    idShort: 'LN',
-    label: 'Lingala',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ln',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/LO',
-    idShort: 'LO',
-    label: 'Lao',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:lo',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/LT',
-    idShort: 'LT',
-    label: 'Lithuanian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:lt',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/LU',
-    idShort: 'LU',
-    label: 'Luba-Katanga',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:lu',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/LV',
-    idShort: 'LV',
-    label: 'Latvian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:lv',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/GV',
-    idShort: 'GV',
-    label: 'Manx',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:gv',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/MK',
-    idShort: 'MK',
-    label: 'Macedonian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:mk',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/MG',
-    idShort: 'MG',
-    label: 'Malagasy',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:mg',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/MS',
-    idShort: 'MS',
-    label: 'Malay',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ms',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/ML',
-    idShort: 'ML',
-    label: 'Malayalam',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ml',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/MT',
-    idShort: 'MT',
-    label: 'Maltese',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:mt',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/MI',
-    idShort: 'MI',
-    label: 'Māori',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:mi',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/MR',
-    idShort: 'MR',
-    label: 'Marathi (Marāṭhī)',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:mr',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/MH',
-    idShort: 'MH',
-    label: 'Marshallese',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:mh',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/MN',
-    idShort: 'MN',
-    label: 'Mongolian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:mn',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/NA',
-    idShort: 'NA',
-    label: 'Nauruan',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:na',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/NV',
-    idShort: 'NV',
-    label: 'Navajo, Navaho',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:nv',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/ND',
-    idShort: 'ND',
-    label: 'Northern Ndebele',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:nd',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/NE',
-    idShort: 'NE',
-    label: 'Nepali',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ne',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/NG',
-    idShort: 'NG',
-    label: 'Ndonga',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ng',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/NB',
-    idShort: 'NB',
-    label: 'Norwegian Bokmål',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:nb',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/NN',
-    idShort: 'NN',
-    label: 'Norwegian Nynorsk',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:nn',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/NO',
-    idShort: 'NO',
-    label: 'Norwegian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:no',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/II',
-    idShort: 'II',
-    label: 'Nuosu',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ii',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/NR',
-    idShort: 'NR',
-    label: 'Southern Ndebele',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:nr',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/OC',
-    idShort: 'OC',
-    label: 'Occitan',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:oc',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/OJ',
-    idShort: 'OJ',
-    label: 'Ojibwe, Ojibwa',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:oj',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/CU',
-    idShort: 'CU',
-    label: 'Old Church Slavonic, Church Slavonic, Old Bulgarian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:cu',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/OM',
-    idShort: 'OM',
-    label: 'Oromo',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:om',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/OR',
-    idShort: 'OR',
-    label: 'Oriya',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:or',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/OS',
-    idShort: 'OS',
-    label: 'Ossetian, Ossetic',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:os',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/PA',
-    idShort: 'PA',
-    label: '(Eastern) Punjabi',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:pa',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/PI',
-    idShort: 'PI',
-    label: 'Pāli',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:pi',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/FA',
-    idShort: 'FA',
-    label: 'Persian (Farsi)',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:fa',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/PL',
-    idShort: 'PL',
-    label: 'Polish',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:pl',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/PS',
-    idShort: 'PS',
-    label: 'Pashto, Pushto',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ps',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/PT',
-    idShort: 'PT',
-    label: 'Portuguese',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:pt',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/QU',
-    idShort: 'QU',
-    label: 'Quechua',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:qu',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/RM',
-    idShort: 'RM',
-    label: 'Romansh',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:rm',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/RN',
-    idShort: 'RN',
-    label: 'Kirundi',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:rn',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/RO',
-    idShort: 'RO',
-    label: 'Romanian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ro',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/RU',
-    idShort: 'RU',
-    label: 'Russian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ru',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/SA',
-    idShort: 'SA',
-    label: 'Sanskrit (Saṁskṛta)',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:sa',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/SC',
-    idShort: 'SC',
-    label: 'Sardinian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:sc',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/SD',
-    idShort: 'SD',
-    label: 'Sindhi',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:sd',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/SE',
-    idShort: 'SE',
-    label: 'Northern Sami',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:se',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/SM',
-    idShort: 'SM',
-    label: 'Samoan',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:sm',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/SG',
-    idShort: 'SG',
-    label: 'Sango',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:sg',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/SR',
-    idShort: 'SR',
-    label: 'Serbian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:sr',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/GD',
-    idShort: 'GD',
-    label: 'Scottish Gaelic, Gaelic',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:gd',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/SN',
-    idShort: 'SN',
-    label: 'Shona',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:sn',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/SI',
-    idShort: 'SI',
-    label: 'Sinhalese, Sinhala',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:si',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/SK',
-    idShort: 'SK',
-    label: 'Slovak',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:sk',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/SL',
-    idShort: 'SL',
-    label: 'Slovene',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:sl',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/SO',
-    idShort: 'SO',
-    label: 'Somali',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:so',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/ST',
-    idShort: 'ST',
-    label: 'outhern Sotho',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:st',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/ES',
-    idShort: 'ES',
-    label: 'Spanish',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:es',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/SU',
-    idShort: 'SU',
-    label: 'Sundanese',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:su',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/SW',
-    idShort: 'SW',
-    label: 'Swahili',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:sw',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/SS',
-    idShort: 'SS',
-    label: 'Swati',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ss',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/SV',
-    idShort: 'SV',
-    label: 'Swedish',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:sv',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/TA',
-    idShort: 'TA',
-    label: 'Tamil',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ta',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/TE',
-    idShort: 'TE',
-    label: 'Telugu',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:te',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/TG',
-    idShort: 'TG',
-    label: 'Tajik',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:tg',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/TH',
-    idShort: 'TH',
-    label: 'Thai',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:th',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/TI',
-    idShort: 'TI',
-    label: 'Tigrinya',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ti',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/BO',
-    idShort: 'BO',
-    label: 'Tibetan Standard, Tibetan, Central',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:bo',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/TK',
-    idShort: 'TK',
-    label: 'Turkmen',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:tk',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/TL',
-    idShort: 'TL',
-    label: 'Tagalog',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:tl',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/TN',
-    idShort: 'TN',
-    label: 'Tswana',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:tn',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/TO',
-    idShort: 'TO',
-    label: 'Tonga (Tonga Islands)',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:to',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/TR',
-    idShort: 'TR',
-    label: 'Turkish',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:tr',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/TS',
-    idShort: 'TS',
-    label: 'Tsonga',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ts',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/TT',
-    idShort: 'TT',
-    label: 'Tatar',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:tt',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/TW',
-    idShort: 'TW',
-    label: 'Twi',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:tw',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/TY',
-    idShort: 'TY',
-    label: 'Tahitian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ty',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/UG',
-    idShort: 'UG',
-    label: 'Uyghur',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ug',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/UK',
-    idShort: 'UK',
-    label: 'Ukrainian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:uk',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/UR',
-    idShort: 'UR',
-    label: 'Urdu',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ur',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/UZ',
-    idShort: 'UZ',
-    label: 'Uzbek',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:uz',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/VE',
-    idShort: 'VE',
-    label: 'Venda',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:ve',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/VI',
-    idShort: 'VI',
-    label: 'Vietnamese',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:vi',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/VO',
-    idShort: 'VO',
-    label: 'Volapük',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:vo',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/WA',
-    idShort: 'WA',
-    label: 'Walloon',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:wa',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/CY',
-    idShort: 'CY',
-    label: 'Welsh',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:cy',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/WO',
-    idShort: 'WO',
-    label: 'Wolof',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:wo',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/FY',
-    idShort: 'FY',
-    label: 'Western Frisian',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:fy',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/XH',
-    idShort: 'XH',
-    label: 'Xhosa',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:xh',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/YI',
-    idShort: 'YI',
-    label: 'Yiddish',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:yi',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/YO',
-    idShort: 'YO',
-    label: 'Yoruba',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:yo',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/ZA',
-    idShort: 'ZA',
-    label: 'Zhuang, Chuang',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:za',
-  },
-
-  {
-    id: 'https://w3id.org/idsa/code/ZU',
-    idShort: 'ZU',
-    label: 'Zulu',
-    sameAs: 'https://dbpedia.org/resource/ISO_639:zu',
-  },
-];
diff --git a/src/app/routes/connector-ui/asset-page/language-select/language-select-item.service.ts b/src/app/routes/connector-ui/asset-page/language-select/language-select-item.service.ts
deleted file mode 100644
index 4c1f8da9a..000000000
--- a/src/app/routes/connector-ui/asset-page/language-select/language-select-item.service.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import {Injectable} from '@angular/core';
-import {LANGUAGE_SELECT_DATA} from './language-select-data';
-import {LanguageSelectItem} from './language-select-item';
-
-/**
- * Access list of available LanguageSelectItems
- */
-@Injectable({providedIn: 'root'})
-export class LanguageSelectItemService {
-  /**
-   * Partition LanguageSelectItems into highlighted and other.
-   * Usability: See important options first and close to each other.
-   */
-  highlightItemIds = [
-    'https://w3id.org/idsa/code/MULTI_LINGUAL',
-    'https://w3id.org/idsa/code/DE',
-    'https://w3id.org/idsa/code/EN',
-  ];
-  highlightItems: LanguageSelectItem[];
-  otherItems: LanguageSelectItem[];
-  itemsByKeyword: Map<string, LanguageSelectItem>;
-
-  constructor() {
-    this.highlightItems = this.buildHighlightItems();
-    this.otherItems = this.buildOtherItems();
-    this.itemsByKeyword = this.buildItemLookupMap();
-  }
-
-  /**
-   * Find LanguageSelectItem by id
-   * @param id language select item id
-   */
-  findById(id: string): LanguageSelectItem {
-    let item = this.itemsByKeyword.get(id);
-    if (!item) {
-      item = {id, label: id};
-    }
-    return item;
-  }
-
-  english(): LanguageSelectItem {
-    return this.findById('https://w3id.org/idsa/code/EN');
-  }
-
-  private buildHighlightItems(): LanguageSelectItem[] {
-    return LANGUAGE_SELECT_DATA.filter((it) =>
-      this.highlightItemIds.includes(it.id),
-    );
-  }
-
-  private buildOtherItems(): LanguageSelectItem[] {
-    return LANGUAGE_SELECT_DATA.filter(
-      (it) => !this.highlightItemIds.includes(it.id),
-    );
-  }
-
-  private buildItemLookupMap(): Map<string, LanguageSelectItem> {
-    const map = new Map<string, LanguageSelectItem>();
-    LANGUAGE_SELECT_DATA.forEach((it) => {
-      map.set(it.id, it);
-      if (it.idShort) {
-        map.set(it.idShort, it);
-      }
-      if (it.sameAs) {
-        map.set(it.sameAs, it);
-      }
-    });
-    return map;
-  }
-}
diff --git a/src/app/routes/connector-ui/asset-page/language-select/language-select-item.ts b/src/app/routes/connector-ui/asset-page/language-select/language-select-item.ts
deleted file mode 100644
index 175da8983..000000000
--- a/src/app/routes/connector-ui/asset-page/language-select/language-select-item.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export interface LanguageSelectItem {
-  id: string;
-  label: string;
-  comment?: string;
-  idShort?: string;
-  sameAs?: string;
-}
diff --git a/src/app/routes/connector-ui/asset-page/language-select/language-select.component.html b/src/app/routes/connector-ui/asset-page/language-select/language-select.component.html
deleted file mode 100644
index 76859b135..000000000
--- a/src/app/routes/connector-ui/asset-page/language-select/language-select.component.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<mat-form-field class="grow form-field" color="accent">
-  <mat-label>{{ label }}</mat-label>
-  <mat-select [formControl]="control" [compareWith]="'id' | compareByField">
-    <mat-option [value]="null">-</mat-option>
-    <mat-option *ngFor="let item of items.highlightItems" [value]="item">
-      {{ item.label }}
-    </mat-option>
-    <mat-divider
-      *ngIf="
-        items.highlightItems.length && items.otherItems.length
-      "></mat-divider>
-    <mat-option *ngFor="let item of items.otherItems" [value]="item">
-      {{ item.label }}
-    </mat-option>
-  </mat-select>
-</mat-form-field>
diff --git a/src/app/routes/connector-ui/asset-page/language-select/language-select.component.ts b/src/app/routes/connector-ui/asset-page/language-select/language-select.component.ts
deleted file mode 100644
index d90ca3822..000000000
--- a/src/app/routes/connector-ui/asset-page/language-select/language-select.component.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import {Component, HostBinding, Input} from '@angular/core';
-import {FormControl} from '@angular/forms';
-import {LanguageSelectItem} from './language-select-item';
-import {LanguageSelectItemService} from './language-select-item.service';
-
-@Component({
-  selector: 'language-select',
-  templateUrl: 'language-select.component.html',
-})
-export class LanguageSelectComponent {
-  @Input()
-  label!: string;
-
-  @Input()
-  control!: FormControl<LanguageSelectItem | null>;
-
-  @HostBinding('class.flex')
-  @HostBinding('class.flex-row')
-  cls = true;
-
-  constructor(public items: LanguageSelectItemService) {}
-}
diff --git a/src/app/routes/connector-ui/asset-page/transport-mode-select/transport-mode-select-data.ts b/src/app/routes/connector-ui/asset-page/transport-mode-select/transport-mode-select-data.ts
deleted file mode 100644
index 9444eb723..000000000
--- a/src/app/routes/connector-ui/asset-page/transport-mode-select/transport-mode-select-data.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import {TransportModeSelectItem} from './transport-mode-select-item';
-
-export const TRANSPORT_MODE_SELECT_DATA: TransportModeSelectItem[] = [
-  {
-    id: 'Rail',
-    label: 'Rail',
-  },
-
-  {
-    id: 'Road',
-    label: 'Road',
-  },
-
-  {
-    id: 'Water',
-    label: 'Water',
-  },
-
-  {
-    id: 'Air',
-    label: 'Air',
-  },
-];
diff --git a/src/app/routes/connector-ui/asset-page/transport-mode-select/transport-mode-select-item.service.ts b/src/app/routes/connector-ui/asset-page/transport-mode-select/transport-mode-select-item.service.ts
deleted file mode 100644
index 78b905432..000000000
--- a/src/app/routes/connector-ui/asset-page/transport-mode-select/transport-mode-select-item.service.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import {Injectable} from '@angular/core';
-import {associateBy} from '../../../../core/utils/map-utils';
-import {TRANSPORT_MODE_SELECT_DATA} from './transport-mode-select-data';
-import {TransportModeSelectItem} from './transport-mode-select-item';
-
-/**
- * Access list of available TransportModeSelectItems
- */
-@Injectable({providedIn: 'root'})
-export class TransportModeSelectItemService {
-  itemsById = associateBy(TRANSPORT_MODE_SELECT_DATA, (it) => it.id);
-
-  /**
-   * Find TransportModeSelectItem by id
-   * @param id language select item id
-   */
-  findById(id: string): TransportModeSelectItem {
-    const item = this.itemsById.get(id);
-    if (item != null) {
-      return item;
-    }
-    return {
-      id,
-      label: id,
-    };
-  }
-}
diff --git a/src/app/routes/connector-ui/asset-page/transport-mode-select/transport-mode-select-item.ts b/src/app/routes/connector-ui/asset-page/transport-mode-select/transport-mode-select-item.ts
deleted file mode 100644
index f516b6cfa..000000000
--- a/src/app/routes/connector-ui/asset-page/transport-mode-select/transport-mode-select-item.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface TransportModeSelectItem {
-  id: string;
-  label: string;
-}
diff --git a/src/app/routes/connector-ui/asset-page/transport-mode-select/transport-mode-select.component.html b/src/app/routes/connector-ui/asset-page/transport-mode-select/transport-mode-select.component.html
deleted file mode 100644
index 9b6585a5a..000000000
--- a/src/app/routes/connector-ui/asset-page/transport-mode-select/transport-mode-select.component.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<mat-form-field class="grow form-field" color="accent">
-  <mat-label>{{ label }}</mat-label>
-  <mat-select [formControl]="control" [compareWith]="'id' | compareByField">
-    <mat-option [value]="null"></mat-option>
-    <mat-option *ngFor="let item of items" [value]="item">
-      {{ item.label }}
-    </mat-option>
-  </mat-select>
-</mat-form-field>
diff --git a/src/app/routes/connector-ui/asset-page/transport-mode-select/transport-mode-select.component.ts b/src/app/routes/connector-ui/asset-page/transport-mode-select/transport-mode-select.component.ts
deleted file mode 100644
index aa0e91685..000000000
--- a/src/app/routes/connector-ui/asset-page/transport-mode-select/transport-mode-select.component.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import {Component, HostBinding, Input} from '@angular/core';
-import {FormControl} from '@angular/forms';
-import {TRANSPORT_MODE_SELECT_DATA} from './transport-mode-select-data';
-import {TransportModeSelectItem} from './transport-mode-select-item';
-
-@Component({
-  selector: 'transport-mode-select',
-  templateUrl: 'transport-mode-select.component.html',
-})
-export class TransportModeSelectComponent {
-  @Input()
-  label!: string;
-
-  @Input()
-  control!: FormControl<TransportModeSelectItem | null>;
-
-  @HostBinding('class.flex')
-  @HostBinding('class.flex-row')
-  cls = true;
-
-  items = TRANSPORT_MODE_SELECT_DATA;
-}
diff --git a/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-fetch-detail-dialog/catalog-browser-fetch-detail-dialog.component.html b/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-fetch-detail-dialog/catalog-browser-fetch-detail-dialog.component.html
index b26962fcb..f1ce90db8 100644
--- a/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-fetch-detail-dialog/catalog-browser-fetch-detail-dialog.component.html
+++ b/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-fetch-detail-dialog/catalog-browser-fetch-detail-dialog.component.html
@@ -1,10 +1,3 @@
-<!--
-  ~ Copyright (c) 2021-2024. sovity GmbH
-  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
-  ~ Contributors:
-  ~    - Fraunhofer FIT: Internationalization and German Localization
-  -->
-
 <div class="mat-card-header" mat-dialog-title removeClass="mat-dialog-title">
   <mat-icon class="mat-card-avatar-icon">view_timeline </mat-icon>
   <div class="mat-card-header-text">
diff --git a/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page.module.ts b/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page.module.ts
index e1d625c34..fcb2e29f4 100644
--- a/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page.module.ts
+++ b/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page.module.ts
@@ -1,44 +1,9 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
-import {ClipboardModule} from '@angular/cdk/clipboard';
 import {CommonModule} from '@angular/common';
 import {HttpClientModule} from '@angular/common/http';
 import {NgModule} from '@angular/core';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {MatBadgeModule} from '@angular/material/badge';
-import {MatButtonModule} from '@angular/material/button';
-import {MatCardModule} from '@angular/material/card';
-import {MatCheckboxModule} from '@angular/material/checkbox';
-import {MatChipsModule} from '@angular/material/chips';
-import {MatDatepickerModule} from '@angular/material/datepicker';
-import {MatDialogModule} from '@angular/material/dialog';
-import {MatDividerModule} from '@angular/material/divider';
-import {MatExpansionModule} from '@angular/material/expansion';
-import {MatFormFieldModule} from '@angular/material/form-field';
-import {MatGridListModule} from '@angular/material/grid-list';
-import {MatIconModule} from '@angular/material/icon';
-import {MatInputModule} from '@angular/material/input';
-import {MatListModule} from '@angular/material/list';
-import {MatPaginatorModule} from '@angular/material/paginator';
-import {MatProgressBarModule} from '@angular/material/progress-bar';
-import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
-import {MatSelectModule} from '@angular/material/select';
-import {MatSlideToggleModule} from '@angular/material/slide-toggle';
-import {MatStepperModule} from '@angular/material/stepper';
-import {MatTableModule} from '@angular/material/table';
-import {MatTabsModule} from '@angular/material/tabs';
-import {MatTooltipModule} from '@angular/material/tooltip';
 import {RouterModule} from '@angular/router';
-import {TranslateModule} from '@ngx-translate/core';
-import {CatalogModule} from '../../../component-library/catalog/catalog.module';
-import {JsonDialogModule} from '../../../component-library/json-dialog/json-dialog.module';
-import {PipesAndDirectivesModule} from '../../../component-library/pipes-and-directives/pipes-and-directives.module';
-import {PropertyGridModule} from '../../../component-library/property-grid/property-grid.module';
-import {UiElementsModule} from '../../../component-library/ui-elements/ui-elements.module';
+import {SharedModule} from '../../../shared/shared.module';
 import {CatalogBrowserFetchDetailDialogComponent} from './catalog-browser-fetch-detail-dialog/catalog-browser-fetch-detail-dialog.component';
 import {CatalogBrowserPageService} from './catalog-browser-page/catalog-browser-page-service';
 import {CatalogBrowserPageComponent} from './catalog-browser-page/catalog-browser-page.component';
@@ -52,41 +17,9 @@ import {DataOfferBuilder} from './catalog-browser-page/data-offer-builder';
     FormsModule,
     ReactiveFormsModule,
     RouterModule,
-    TranslateModule,
-    // Angular CDK
-    ClipboardModule,
 
-    // Angular Material
-    MatBadgeModule,
-    MatButtonModule,
-    MatCardModule,
-    MatCheckboxModule,
-    MatChipsModule,
-    MatDatepickerModule,
-    MatDialogModule,
-    MatDividerModule,
-    MatExpansionModule,
-    MatFormFieldModule,
-    MatGridListModule,
-    MatIconModule,
-    MatInputModule,
-    MatListModule,
-    MatPaginatorModule,
-    MatProgressBarModule,
-    MatProgressSpinnerModule,
-    MatSelectModule,
-    MatSlideToggleModule,
-    MatStepperModule,
-    MatTableModule,
-    MatTabsModule,
-    MatTooltipModule,
-
-    // Feature Modules
-    CatalogModule,
-    PipesAndDirectivesModule,
-    UiElementsModule,
-    JsonDialogModule,
-    PropertyGridModule,
+    // EDC UI Modules
+    SharedModule,
   ],
   declarations: [
     CatalogBrowserPageComponent,
diff --git a/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/catalog-browser-page.component.html b/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/catalog-browser-page.component.html
index 52c15f2ca..f08c5c141 100644
--- a/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/catalog-browser-page.component.html
+++ b/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/catalog-browser-page.component.html
@@ -1,10 +1,3 @@
-<!--
-  ~ Copyright (c) 2021-2024. sovity GmbH
-  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
-  ~ Contributors:
-  ~    - Fraunhofer FIT: Internationalization and German Localization
-  -->
-
 <div id="wrapper">
   <div class="flex flex-row">
     <!-- Search Bar -->
@@ -50,7 +43,7 @@
         *ngIf="!data.requestTotals.isDone"
         matSuffix
         mat-icon-button
-        matTooltip="{{ 'tooltip.details' | translate }}"
+        [matTooltip]="'tooltip.details' | translate"
         (click)="onShowFetchDetails()">
         <mat-progress-spinner
           matSuffix
@@ -65,7 +58,7 @@
         matSuffix
         color="warn"
         mat-icon-button
-        matTooltip="{{ 'tooltip.failed_details' | translate }}"
+        [matTooltip]="'tooltip.failed_details' | translate"
         (click)="onShowFetchDetails()">
         <mat-icon>warning</mat-icon>
       </button>
@@ -74,7 +67,7 @@
         matSuffix
         color="primary"
         mat-icon-button
-        matTooltip="{{ 'tooltip.details' | translate }}"
+        [matTooltip]="'tooltip.details' | translate"
         (click)="onShowFetchDetails()">
         <mat-icon>info</mat-icon>
       </button>
diff --git a/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/catalog-browser-page.component.ts b/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/catalog-browser-page.component.ts
index 10cf2d982..9a3e26876 100644
--- a/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/catalog-browser-page.component.ts
+++ b/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/catalog-browser-page.component.ts
@@ -10,11 +10,12 @@ import {
   switchMap,
 } from 'rxjs';
 import {filter, map} from 'rxjs/operators';
-import {AssetDetailDialogDataService} from '../../../../component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.service';
-import {AssetDetailDialogService} from '../../../../component-library/catalog/asset-detail-dialog/asset-detail-dialog.service';
+import {TranslateService} from '@ngx-translate/core';
 import {ConnectorLimitsService} from '../../../../core/services/connector-limits.service';
 import {DataOffer} from '../../../../core/services/models/data-offer';
 import {value$} from '../../../../core/utils/form-group-utils';
+import {AssetDetailDialogDataService} from '../../../../shared/business/asset-detail-dialog/asset-detail-dialog-data.service';
+import {AssetDetailDialogService} from '../../../../shared/business/asset-detail-dialog/asset-detail-dialog.service';
 import {CatalogBrowserFetchDetailDialogComponent} from '../catalog-browser-fetch-detail-dialog/catalog-browser-fetch-detail-dialog.component';
 import {CatalogBrowserFetchDetailDialogData} from '../catalog-browser-fetch-detail-dialog/catalog-browser-fetch-detail-dialog.data';
 import {CatalogApiUrlService} from './catalog-api-url.service';
@@ -41,6 +42,7 @@ export class CatalogBrowserPageComponent implements OnInit, OnDestroy {
     private catalogApiUrlService: CatalogApiUrlService,
     private matDialog: MatDialog,
     private connectorLimitsService: ConnectorLimitsService,
+    private translateService: TranslateService,
   ) {}
 
   ngOnInit(): void {
@@ -87,12 +89,13 @@ export class CatalogBrowserPageComponent implements OnInit, OnDestroy {
 
   private buildPresetCatalogUrlsMessage(): string {
     const urls = this.catalogApiUrlService.getPresetProviders();
+    const usage = this.translateService.instant('catalog_browser_page.usage');
     if (!urls.length) {
       return '';
     }
-    return `Already using${
-      urls.length > 1 ? ` (${urls.length})` : ''
-    }: ${urls.join(', ')}`;
+    return `${usage} ${urls.length > 1 ? ` (${urls.length})` : ''}: ${urls.join(
+      ', ',
+    )}`;
   }
 
   private searchText$(): Observable<string> {
diff --git a/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/data-offer-builder.ts b/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/data-offer-builder.ts
index 6dc2fddcd..782299344 100644
--- a/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/data-offer-builder.ts
+++ b/src/app/routes/connector-ui/catalog-browser-page/catalog-browser-page/data-offer-builder.ts
@@ -1,17 +1,11 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
 import {Injectable} from '@angular/core';
 import {TranslateService} from '@ngx-translate/core';
 import {UiContractOffer, UiDataOffer} from '@sovity.de/edc-client';
-import {PolicyPropertyFieldBuilder} from '../../../../component-library/catalog/asset-detail-dialog/policy-property-field-builder';
 import {AssetBuilder} from '../../../../core/services/asset-builder';
 import {ContractOffer} from '../../../../core/services/models/contract-offer';
 import {DataOffer} from '../../../../core/services/models/data-offer';
 import {UiAssetMapped} from '../../../../core/services/models/ui-asset-mapped';
+import {PolicyPropertyFieldBuilder} from '../../../../shared/business/asset-detail-dialog/policy-property-field-builder';
 
 @Injectable()
 export class DataOfferBuilder {
diff --git a/src/app/routes/connector-ui/connector-ui-routing.module.ts b/src/app/routes/connector-ui/connector-ui-routing.module.ts
index cc27ea88a..04d609117 100644
--- a/src/app/routes/connector-ui/connector-ui-routing.module.ts
+++ b/src/app/routes/connector-ui/connector-ui-routing.module.ts
@@ -1,13 +1,7 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
 import {NgModule} from '@angular/core';
 import {RouterModule, Routes} from '@angular/router';
 import {AssetEditPageComponent} from './asset-edit-page/asset-edit-page/asset-edit-page.component';
-import {AssetPageComponent} from './asset-page/asset-page/asset-page.component';
+import {AssetListPageComponent} from './asset-list-page/asset-list-page/asset-list-page.component';
 import {CatalogBrowserPageComponent} from './catalog-browser-page/catalog-browser-page/catalog-browser-page.component';
 import {ConnectorUiComponent} from './connector-ui.component';
 import {ContractAgreementPageComponent} from './contract-agreement-page/contract-agreement-page/contract-agreement-page.component';
@@ -27,57 +21,57 @@ export const routes: Routes = [
   {
     path: 'dashboard',
     component: DashboardPageComponent,
-    data: {title: 'Dashboard'},
+    data: {title: 'dashboard_page.title'},
   },
   {
     path: 'create-asset',
     component: AssetEditPageComponent,
-    data: {title: 'Create Data Offer'},
-  },
-  {
-    path: 'edit-asset/:id',
-    component: AssetEditPageComponent,
-    data: {title: 'Edit Asset'},
+    data: {title: 'create_data_offer_page.title'},
   },
   {
     path: 'catalog-browser',
     component: CatalogBrowserPageComponent,
-    data: {title: 'Catalog Browser'},
+    data: {title: 'catalog_browser_page.title'},
   },
   {
     path: 'contracts',
     component: ContractAgreementPageComponent,
-    data: {title: 'Contracts'},
+    data: {title: 'contract_agreement_page.title'},
   },
   {
     path: 'transfer-history',
     component: TransferHistoryPageComponent,
-    data: {title: 'Transfer History'},
+    data: {title: 'transfer_history_page.title'},
   },
   {
     path: 'my-assets', // must not be "assets" to prevent conflict with assets directory
-    component: AssetPageComponent,
-    data: {title: 'Assets'},
+    component: AssetListPageComponent,
+    data: {title: 'asset_list_page.title'},
+  },
+  {
+    path: 'my-assets/:id/edit',
+    component: AssetEditPageComponent,
+    data: {title: 'edit_asset_page.title'},
   },
   {
     path: 'policies',
     component: PolicyDefinitionPageComponent,
-    data: {title: 'Policies'},
+    data: {title: 'policy_definition_page.title'},
   },
   {
     path: 'policies/create',
     component: PolicyDefinitionCreatePageComponent,
-    data: {title: 'Create Policy'},
+    data: {title: 'create_policy_page.title'},
   },
   {
     path: 'data-offers',
     component: ContractDefinitionPageComponent,
-    data: {title: 'Data Offers'},
+    data: {title: 'contract_definition_page.title'},
   },
   {
     path: 'logout',
     component: LogoutPageComponent,
-    data: {title: 'Logout'},
+    data: {title: 'logout_page.title'},
   },
 ];
 
diff --git a/src/app/routes/connector-ui/connector-ui.component.html b/src/app/routes/connector-ui/connector-ui.component.html
index 94ee7c661..756cf3f94 100644
--- a/src/app/routes/connector-ui/connector-ui.component.html
+++ b/src/app/routes/connector-ui/connector-ui.component.html
@@ -1,16 +1,8 @@
-<!--
-  ~ Copyright (c) 2021-2024. sovity GmbH
-  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
-  ~ Contributors:
-  ~    - Fraunhofer FIT: Internationalization and German Localization
-  -->
-
 <mat-sidenav-container class="sidenav-container">
   <mat-sidenav
     class="sidenav"
     #drawer
     fixedInViewport
-    [disableClose]="true"
     [attr.role]="(isHandset$ | async) ? 'dialog' : 'navigation'"
     [mode]="(isHandset$ | async) ? 'over' : 'side'"
     [opened]="(isHandset$ | async) === false">
@@ -34,13 +26,12 @@
             [routerLink]="[navItem.path]">
             <mat-list-item [routerLinkActive]="['is-active']">
               <mat-icon mat-list-icon>{{ navItem.icon }}</mat-icon>
-              <span matLine>{{ navItem.title }}</span>
+              <span matLine>{{ navItem.title | translate }}</span>
             </mat-list-item>
           </a>
         </mat-nav-list>
       </div>
     </div>
-    <app-language-selector style="display: flex;" class="language"></app-language-selector>
     <div
       *ngIf="'sovity-zammad-integration' | isActiveFeature"
       id="contact-form"
@@ -73,7 +64,7 @@
     </div>
   </mat-sidenav>
   <mat-sidenav-content>
-    <mat-toolbar color="primary">
+    <mat-toolbar class="flex items-center" color="primary">
       <button
         *ngIf="isHandset$ | async"
         type="button"
@@ -82,7 +73,10 @@
         (click)="drawer.toggle()">
         <mat-icon aria-label="Side nav toggle icon">menu</mat-icon>
       </button>
-      <span>{{ titleService.getTitle() || '' | translate }}</span>
+      <span class="flex-grow">{{
+        titleService.getTitle() || '' | translate
+      }}</span>
+      <app-language-selector></app-language-selector>
     </mat-toolbar>
     <main class="container">
       <router-outlet></router-outlet>
diff --git a/src/app/routes/connector-ui/connector-ui.component.scss b/src/app/routes/connector-ui/connector-ui.component.scss
index 13b58fd1f..67fc9a63d 100644
--- a/src/app/routes/connector-ui/connector-ui.component.scss
+++ b/src/app/routes/connector-ui/connector-ui.component.scss
@@ -1,25 +1,7 @@
-/*!
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
-
 .sidenav-container {
   height: 100%;
 }
 
-.languageSelector {
-  width: 10px;
-  background-color: red;
-}
-
-.language {
-  margin-top: 10px;
-  margin-right: auto;
-  padding: 8px 16px;
-}
-
 .sidenav {
   width: 300px;
 }
diff --git a/src/app/routes/connector-ui/connector-ui.component.ts b/src/app/routes/connector-ui/connector-ui.component.ts
index dc1d82e5a..03dce9a69 100644
--- a/src/app/routes/connector-ui/connector-ui.component.ts
+++ b/src/app/routes/connector-ui/connector-ui.component.ts
@@ -1,26 +1,18 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
 import {BreakpointObserver, Breakpoints} from '@angular/cdk/layout';
 import {Component, Inject, OnInit} from '@angular/core';
 import {Title} from '@angular/platform-browser';
 import {Observable} from 'rxjs';
 import {map, shareReplay} from 'rxjs/operators';
+import {TranslateService} from '@ngx-translate/core';
 import {NavItemGroup} from 'src/app/core/services/models/nav-item-group';
 import {NavItemsBuilder} from 'src/app/core/services/nav-items-builder';
-import {TranslateService} from '@ngx-translate/core';
 import {APP_CONFIG, AppConfig} from '../../core/config/app-config';
 import {LoginPollingService} from '../../core/services/login-polling.service';
-import {TitleUtilsService} from '../../core/services/title-utils.service';
 
 @Component({
   selector: 'connector-ui-page-layout',
   templateUrl: './connector-ui.component.html',
   styleUrls: ['./connector-ui.component.scss'],
-  providers: [TitleUtilsService],
 })
 export class ConnectorUiComponent implements OnInit {
   isHandset$: Observable<boolean> = this.breakpointObserver
@@ -34,7 +26,6 @@ export class ConnectorUiComponent implements OnInit {
 
   constructor(
     @Inject(APP_CONFIG) public config: AppConfig,
-    public titleUtilsService: TitleUtilsService,
     public titleService: Title,
     private breakpointObserver: BreakpointObserver,
     private loginPollingService: LoginPollingService,
@@ -47,7 +38,6 @@ export class ConnectorUiComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.titleUtilsService.startUpdatingTitleFromRouteData('EDC Connector');
     this.startLoginPolling();
   }
 
diff --git a/src/app/routes/connector-ui/connector-ui.module.ts b/src/app/routes/connector-ui/connector-ui.module.ts
index 4866cc33a..1419ee622 100644
--- a/src/app/routes/connector-ui/connector-ui.module.ts
+++ b/src/app/routes/connector-ui/connector-ui.module.ts
@@ -1,38 +1,19 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
 import {CommonModule} from '@angular/common';
 import {HttpClient} from '@angular/common/http';
 import {NgModule} from '@angular/core';
-import {MatButtonModule} from '@angular/material/button';
-import {MatNativeDateModule} from '@angular/material/core';
-import {MatDatepickerModule} from '@angular/material/datepicker';
-import {MatFormFieldModule} from '@angular/material/form-field';
-import {MatIconModule} from '@angular/material/icon';
-import {MatListModule} from '@angular/material/list';
-import {MatMenuModule} from '@angular/material/menu';
-import {MatSelectModule} from '@angular/material/select';
-import {MatSidenavModule} from '@angular/material/sidenav';
-import {MatSnackBarModule} from '@angular/material/snack-bar';
-import {MatToolbarModule} from '@angular/material/toolbar';
-import {TranslateModule} from '@ngx-translate/core';
-import {PipesAndDirectivesModule} from '../../component-library/pipes-and-directives/pipes-and-directives.module';
-import {UiElementsModule} from '../../component-library/ui-elements/ui-elements.module';
+import {SharedModule} from '../../shared/shared.module';
 import {AssetEditPageModule} from './asset-edit-page/asset-edit-page.module';
-import {AssetPageModule} from './asset-page/asset-page.module';
+import {AssetListPageModule} from './asset-list-page/asset-list-page.module';
 import {CatalogBrowserPageModule} from './catalog-browser-page/catalog-browser-page.module';
 import {ConnectorUiRoutingModule} from './connector-ui-routing.module';
 import {ConnectorUiComponent} from './connector-ui.component';
 import {ContractAgreementPageModule} from './contract-agreement-page/contract-agreement-page.module';
 import {ContractDefinitionPageModule} from './contract-definition-page/contract-definition-page.module';
 import {DashboardPageModule} from './dashboard-page/dashboard-page.module';
-import {LanguageSelectorComponent} from './language-selector/language-selector.component';
 import {LocationHistoryUtils} from './logout-page/location-history-utils';
 import {LogoutPageModule} from './logout-page/logout-page.module';
 import {PreviousRouteListener} from './logout-page/previous-route-listener';
+import {PageNotFoundPageModule} from './page-not-found-page/page-not-found-page.module';
 import {PolicyDefinitionCreatePageModule} from './policy-definition-create-page/policy-definition-create-page.module';
 import {PolicyDefinitionPageModule} from './policy-definition-page/policy-definition-page.module';
 import {TransferHistoryPageModule} from './transfer-history-page/transfer-history-page.module';
@@ -42,26 +23,11 @@ import {TransferHistoryPageModule} from './transfer-history-page/transfer-histor
     // Angular
     CommonModule,
 
-    // Angular Material
-    MatButtonModule,
-    MatDatepickerModule,
-    MatIconModule,
-    MatListModule,
-    MatNativeDateModule,
-    MatSidenavModule,
-    MatSnackBarModule,
-    MatToolbarModule,
-    MatMenuModule,
-    MatFormFieldModule,
-    MatSelectModule,
-
     // Features
-    PipesAndDirectivesModule,
-    UiElementsModule,
-    TranslateModule,
+    SharedModule,
 
     // Pages
-    AssetPageModule,
+    AssetListPageModule,
     AssetEditPageModule,
     CatalogBrowserPageModule,
     ContractAgreementPageModule,
@@ -71,11 +37,12 @@ import {TransferHistoryPageModule} from './transfer-history-page/transfer-histor
     PolicyDefinitionPageModule,
     PolicyDefinitionCreatePageModule,
     TransferHistoryPageModule,
+    PageNotFoundPageModule,
 
     // Routing
     ConnectorUiRoutingModule,
   ],
-  declarations: [ConnectorUiComponent, LanguageSelectorComponent],
+  declarations: [ConnectorUiComponent],
   providers: [PreviousRouteListener, LocationHistoryUtils, HttpClient],
 })
 export class ConnectorUiModule {
diff --git a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-cards.component.html b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-cards.component.html
index 2f624f180..e5c8e1bc4 100644
--- a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-cards.component.html
+++ b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-cards.component.html
@@ -1,10 +1,3 @@
-<!--
-  ~ Copyright (c) 2021-2024. sovity GmbH
-  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
-  ~ Contributors:
-  ~    - Fraunhofer FIT: Internationalization and German Localization
-  -->
-
 <div class="flex flex-row flex-wrap gap-[16px] justify-start">
   <mat-card
     *ngFor="let card of contractAgreements"
diff --git a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page.module.ts b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page.module.ts
index f5ca6e815..c5e4e945d 100644
--- a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page.module.ts
+++ b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page.module.ts
@@ -1,38 +1,8 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {MatBadgeModule} from '@angular/material/badge';
-import {MatButtonModule} from '@angular/material/button';
-import {MatButtonToggleModule} from '@angular/material/button-toggle';
-import {MatCardModule} from '@angular/material/card';
-import {MatCheckboxModule} from '@angular/material/checkbox';
-import {MatChipsModule} from '@angular/material/chips';
-import {MatDatepickerModule} from '@angular/material/datepicker';
-import {MatDialogModule} from '@angular/material/dialog';
-import {MatFormFieldModule} from '@angular/material/form-field';
-import {MatIconModule} from '@angular/material/icon';
-import {MatInputModule} from '@angular/material/input';
-import {MatPaginatorModule} from '@angular/material/paginator';
-import {MatProgressBarModule} from '@angular/material/progress-bar';
-import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
-import {MatSelectModule} from '@angular/material/select';
-import {MatSlideToggleModule} from '@angular/material/slide-toggle';
-import {MatStepperModule} from '@angular/material/stepper';
-import {MatTooltipModule} from '@angular/material/tooltip';
 import {RouterModule} from '@angular/router';
-import {TranslateModule} from '@ngx-translate/core';
-import {NgChartsModule} from 'ng2-charts';
-import {NgxJsonViewerModule} from 'ngx-json-viewer';
-import {CatalogModule} from '../../../component-library/catalog/catalog.module';
-import {DataAddressModule} from '../../../component-library/data-address/data-address.module';
-import {PipesAndDirectivesModule} from '../../../component-library/pipes-and-directives/pipes-and-directives.module';
-import {UiElementsModule} from '../../../component-library/ui-elements/ui-elements.module';
+import {SharedModule} from '../../../shared/shared.module';
 import {ContractAgreementCardsComponent} from './contract-agreement-cards/contract-agreement-cards.component';
 import {ContractAgreementPageComponent} from './contract-agreement-page/contract-agreement-page.component';
 import {ContractAgreementTerminationDialogComponent} from './contract-agreement-termination-dialog/contract-agreement-termination-dialog.component';
@@ -45,36 +15,9 @@ import {ContractAgreementTransferDialogComponent} from './contract-agreement-tra
     FormsModule,
     ReactiveFormsModule,
     RouterModule,
-    TranslateModule,
-    // Angular Material
-    MatBadgeModule,
-    MatButtonModule,
-    MatCardModule,
-    MatCheckboxModule,
-    MatChipsModule,
-    MatDatepickerModule,
-    MatFormFieldModule,
-    MatProgressSpinnerModule,
-    MatSelectModule,
-    MatSlideToggleModule,
-    MatStepperModule,
-    MatTooltipModule,
-    MatPaginatorModule,
-    MatProgressBarModule,
-    MatInputModule,
-    MatIconModule,
-    MatDialogModule,
-
-    // Third Party
-    NgChartsModule,
-    NgxJsonViewerModule,
 
     // EDC UI Modules
-    CatalogModule,
-    DataAddressModule,
-    PipesAndDirectivesModule,
-    UiElementsModule,
-    MatButtonToggleModule,
+    SharedModule,
   ],
   declarations: [
     ContractAgreementPageComponent,
diff --git a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page/contract-agreement-page.component.html b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page/contract-agreement-page.component.html
index 7dc6d1c42..33762b650 100644
--- a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page/contract-agreement-page.component.html
+++ b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page/contract-agreement-page.component.html
@@ -1,10 +1,3 @@
-<!--
-  ~ Copyright (c) 2021-2024. sovity GmbH
-  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
-  ~ Contributors:
-  ~    - Fraunhofer FIT: Internationalization and German Localization
-  -->
-
 <div id="wrapper">
   <div class="flex flex-row gap-4">
     <!-- Search -->
@@ -91,7 +84,7 @@
     class="flex flex-col space-y-[20px]">
     <ng-container *ngIf="page.data.consumingContractAgreements.length">
       <horizontal-section-divider
-        text="{{ 'contract_agreement_page.con_agree' | translate }}">
+        [text]="'contract_agreement_page.con_agree' | translate">
       </horizontal-section-divider>
 
       <contract-agreement-cards
@@ -103,7 +96,7 @@
 
     <ng-container *ngIf="page.data.providingContractAgreements.length">
       <horizontal-section-divider
-        text="{{ 'contract_agreement_page.prov_agree' | translate }}">
+        [text]="'contract_agreement_page.prov_agree' | translate">
       </horizontal-section-divider>
 
       <contract-agreement-cards
diff --git a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page/contract-agreement-page.component.ts b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page/contract-agreement-page.component.ts
index 9ca89466d..5d8495fdb 100644
--- a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page/contract-agreement-page.component.ts
+++ b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page/contract-agreement-page.component.ts
@@ -16,12 +16,12 @@ import {
 } from 'rxjs';
 import {catchError, filter, map, takeUntil} from 'rxjs/operators';
 import {ContractTerminationStatus} from '@sovity.de/edc-client';
-import {AssetDetailDialogDataService} from 'src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.service';
-import {AssetDetailDialogService} from '../../../../component-library/catalog/asset-detail-dialog/asset-detail-dialog.service';
 import {EdcApiService} from '../../../../core/services/api/edc-api.service';
 import {Fetched} from '../../../../core/services/models/fetched';
 import {value$} from '../../../../core/utils/form-group-utils';
 import {filterNotNull} from '../../../../core/utils/rxjs-utils';
+import {AssetDetailDialogDataService} from '../../../../shared/business/asset-detail-dialog/asset-detail-dialog-data.service';
+import {AssetDetailDialogService} from '../../../../shared/business/asset-detail-dialog/asset-detail-dialog.service';
 import {ContractAgreementCardMapped} from '../contract-agreement-cards/contract-agreement-card-mapped';
 import {ContractAgreementCardMappedService} from '../contract-agreement-cards/contract-agreement-card-mapped.service';
 import {ContractAgreementPageData} from './contract-agreement-page.data';
diff --git a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog-form-model.ts b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog-form-model.ts
index 5e3edf595..65b6da841 100644
--- a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog-form-model.ts
+++ b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog-form-model.ts
@@ -4,8 +4,8 @@ import {
   FormGroup,
   ɵFormGroupValue,
 } from '@angular/forms';
-import {HttpDatasourceQueryParamFormModel} from 'src/app/component-library/edit-asset-form/edit-asset-form/form/model/http-datasource-query-param-form-model';
-import {DataAddressType} from '../../../../component-library/data-address/data-address-type-select/data-address-type';
+import {HttpDatasourceQueryParamFormModel} from '../../../../shared/business/edit-asset-form/form/model/http-datasource-query-param-form-model';
+import {DataAddressType} from '../../../../shared/form-elements/data-address-type-select/data-address-type';
 import {HttpDatasinkAuthHeaderType} from './http-datasink-auth-header-type';
 import {HttpDatasinkHeaderFormModel} from './http-datasink-header-form-model';
 
diff --git a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog-form.ts b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog-form.ts
index 98219c30b..81de2b6cb 100644
--- a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog-form.ts
+++ b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog-form.ts
@@ -1,11 +1,11 @@
 import {Injectable} from '@angular/core';
 import {FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {HttpDatasourceAuthHeaderType} from 'src/app/component-library/edit-asset-form/edit-asset-form/form/model/http-datasource-auth-header-type';
-import {HttpDatasourceQueryParamFormModel} from 'src/app/component-library/edit-asset-form/edit-asset-form/form/model/http-datasource-query-param-form-model';
-import {DataAddressType} from '../../../../component-library/data-address/data-address-type-select/data-address-type';
 import {switchDisabledControls} from '../../../../core/utils/form-group-utils';
 import {jsonValidator} from '../../../../core/validators/json-validator';
 import {urlValidator} from '../../../../core/validators/url-validator';
+import {HttpDatasourceAuthHeaderType} from '../../../../shared/business/edit-asset-form/form/model/http-datasource-auth-header-type';
+import {HttpDatasourceQueryParamFormModel} from '../../../../shared/business/edit-asset-form/form/model/http-datasource-query-param-form-model';
+import {DataAddressType} from '../../../../shared/form-elements/data-address-type-select/data-address-type';
 import {
   ContractAgreementTransferDialogFormModel,
   ContractAgreementTransferDialogFormValue,
diff --git a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog.component.html b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog.component.html
index b887a9ace..b36628dbc 100644
--- a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog.component.html
+++ b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog.component.html
@@ -1,10 +1,3 @@
-<!--
-  ~ Copyright (c) 2021-2024. sovity GmbH
-  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
-  ~ Contributors:
-  ~    - Fraunhofer FIT: Internationalization and German Localization
-  -->
-
 <h1 mat-dialog-title>
   {{ 'contract_agreement_page.ini_transfer' | translate }}
 </h1>
@@ -17,8 +10,8 @@ <h1 mat-dialog-title>
 
       <!-- Data Address Type -->
       <data-address-type-select
-        label="{{ 'general.type' | translate }}"
         mode="Datasink"
+        [label]="'general.type' | translate"
         [control]="
           form.all.controls.dataAddressType
         "></data-address-type-select>
diff --git a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog.component.ts b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog.component.ts
index d73c7632c..c2ae2e7c2 100644
--- a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog.component.ts
+++ b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-transfer-dialog/contract-agreement-transfer-dialog.component.ts
@@ -7,15 +7,15 @@ import {
   InitiateCustomTransferRequest,
   InitiateTransferRequest,
 } from '@sovity.de/edc-client';
-import {
-  DATA_SINK_HTTP_METHODS,
-  DATA_SOURCE_HTTP_METHODS,
-} from 'src/app/component-library/edit-asset-form/edit-asset-form/form/http-methods';
 import {EdcApiService} from '../../../../core/services/api/edc-api.service';
 import {DataAddressMapper} from '../../../../core/services/data-address-mapper';
 import {NotificationService} from '../../../../core/services/notification.service';
 import {TransferDataSinkMapper} from '../../../../core/services/transfer-data-sink-mapper';
 import {ValidationMessages} from '../../../../core/validators/validation-messages';
+import {
+  DATA_SINK_HTTP_METHODS,
+  DATA_SOURCE_HTTP_METHODS,
+} from '../../../../shared/business/edit-asset-form/form/http-methods';
 import {ContractAgreementTransferDialogData} from './contract-agreement-transfer-dialog-data';
 import {ContractAgreementTransferDialogForm} from './contract-agreement-transfer-dialog-form';
 import {ContractAgreementTransferDialogFormValue} from './contract-agreement-transfer-dialog-form-model';
diff --git a/src/app/routes/connector-ui/contract-definition-page/asset-select/asset-select.component.ts b/src/app/routes/connector-ui/contract-definition-page/asset-select/asset-select.component.ts
index 02059d090..500c812b3 100644
--- a/src/app/routes/connector-ui/contract-definition-page/asset-select/asset-select.component.ts
+++ b/src/app/routes/connector-ui/contract-definition-page/asset-select/asset-select.component.ts
@@ -1,9 +1,9 @@
 import {Component, Input, OnDestroy} from '@angular/core';
 import {FormControl} from '@angular/forms';
 import {Subject} from 'rxjs';
-import {AssetDetailDialogDataService} from '../../../../component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.service';
-import {AssetDetailDialogService} from '../../../../component-library/catalog/asset-detail-dialog/asset-detail-dialog.service';
 import {UiAssetMapped} from '../../../../core/services/models/ui-asset-mapped';
+import {AssetDetailDialogDataService} from '../../../../shared/business/asset-detail-dialog/asset-detail-dialog-data.service';
+import {AssetDetailDialogService} from '../../../../shared/business/asset-detail-dialog/asset-detail-dialog.service';
 
 @Component({
   selector: 'asset-select',
diff --git a/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.html b/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.html
index 5572103d6..9e22253b4 100644
--- a/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.html
+++ b/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.html
@@ -12,12 +12,12 @@
           {{ card.id }}
         </a>
       </mat-card-title>
-      <mat-card-subtitle>Data Offer</mat-card-subtitle>
+      <mat-card-subtitle>{{ 'general.con_def' | translate }}</mat-card-subtitle>
     </mat-card-header>
     <mat-card-content class="flex flex-col space-y-[16px]">
       <div class="flex flex-col">
         <div class="text-slate text-sm uppercase tracking-wider">
-          Access Policy
+          {{ 'general.access_pol' | translate }}
         </div>
         <div>
           <a
@@ -34,7 +34,7 @@
       </div>
       <div class="flex flex-col">
         <div class="text-slate text-sm uppercase tracking-wider">
-          Contract Policy
+          {{ 'general.policy' | translate }}
         </div>
         <div>
           <a
diff --git a/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.ts b/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.ts
index d095dbdf9..65149f27c 100644
--- a/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.ts
+++ b/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.ts
@@ -9,15 +9,16 @@ import {
 import {MatDialog, MatDialogRef} from '@angular/material/dialog';
 import {EMPTY, Subject} from 'rxjs';
 import {catchError, filter, tap} from 'rxjs/operators';
+import {TranslateService} from '@ngx-translate/core';
 import {PolicyDefinitionDto} from '@sovity.de/edc-client';
-import {AssetDetailDialogDataService} from '../../../../component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.service';
-import {AssetDetailDialogService} from '../../../../component-library/catalog/asset-detail-dialog/asset-detail-dialog.service';
-import {ConfirmDialogModel} from '../../../../component-library/confirmation-dialog/confirmation-dialog/confirmation-dialog.component';
-import {JsonDialogComponent} from '../../../../component-library/json-dialog/json-dialog/json-dialog.component';
-import {JsonDialogData} from '../../../../component-library/json-dialog/json-dialog/json-dialog.data';
 import {EdcApiService} from '../../../../core/services/api/edc-api.service';
 import {UiAssetMapped} from '../../../../core/services/models/ui-asset-mapped';
 import {NotificationService} from '../../../../core/services/notification.service';
+import {AssetDetailDialogDataService} from '../../../../shared/business/asset-detail-dialog/asset-detail-dialog-data.service';
+import {AssetDetailDialogService} from '../../../../shared/business/asset-detail-dialog/asset-detail-dialog.service';
+import {ConfirmDialogModel} from '../../../../shared/common/confirmation-dialog/confirmation-dialog.component';
+import {JsonDialogComponent} from '../../../../shared/common/json-dialog/json-dialog.component';
+import {JsonDialogData} from '../../../../shared/common/json-dialog/json-dialog.data';
 import {ContractDefinitionCard} from './contract-definition-card';
 
 @Component({
@@ -45,6 +46,7 @@ export class ContractDefinitionCardsComponent implements OnDestroy {
     private assetDetailDialogService: AssetDetailDialogService,
     private matDialog: MatDialog,
     private notificationService: NotificationService,
+    private translateService: TranslateService,
   ) {}
 
   onPolicyClick(policyDefinition: PolicyDefinitionDto) {
@@ -75,7 +77,11 @@ export class ContractDefinitionCardsComponent implements OnDestroy {
       toolbarButton: {
         text: 'Delete',
         icon: 'delete',
-        confirmation: ConfirmDialogModel.forDelete('data offer', card.id),
+        confirmation: ConfirmDialogModel.forDelete(
+          'data offer', // TODO
+          card.id,
+          this.translateService,
+        ),
         action: () =>
           this.edcApiService.deleteContractDefinition(card.id).pipe(
             tap(() => {
diff --git a/src/app/routes/connector-ui/contract-definition-page/contract-definition-editor-dialog/contract-definition-editor-dialog.component.html b/src/app/routes/connector-ui/contract-definition-page/contract-definition-editor-dialog/contract-definition-editor-dialog.component.html
index dbf2939a7..c85bd6d0b 100644
--- a/src/app/routes/connector-ui/contract-definition-page/contract-definition-editor-dialog/contract-definition-editor-dialog.component.html
+++ b/src/app/routes/connector-ui/contract-definition-page/contract-definition-editor-dialog/contract-definition-editor-dialog.component.html
@@ -1,4 +1,4 @@
-<h1 mat-dialog-title>Publish New Data Offer</h1>
+<h1 mat-dialog-title>{{ 'contract_agreement_page.new_def' | translate }}</h1>
 
 <mat-dialog-content class="w-[800px]">
   <div class="flex flex-col mt-[10px]">
@@ -16,20 +16,20 @@ <h1 mat-dialog-title>Publish New Data Offer</h1>
 
     <!-- Access Policy -->
     <policy-select
-      label="Access Policy"
+      [label]="'general.access_pol' | translate"
       [control]="form.group.controls.accessPolicy"
       [policies]="policies"></policy-select>
 
     <!-- Contract Policy -->
     <policy-select
-      label="Contract Policy"
+      [label]="'general.policy' | translate"
       [control]="form.group.controls.contractPolicy"
       [policies]="policies"></policy-select>
 
     <!-- Assets -->
     <asset-select
       *ngIf="form.group.controls.assets; let ctrl"
-      label="Assets"
+      [label]="'general.assets' | translate"
       [control]="form.group.controls.assets"
       [assets]="assets"></asset-select>
   </div>
@@ -37,7 +37,7 @@ <h1 mat-dialog-title>Publish New Data Offer</h1>
 
 <mat-dialog-actions class="flex flex-row justify-end">
   <button mat-button [mat-dialog-close]="null" [disabled]="loading">
-    Cancel
+    {{ 'general.cancel' | translate }}
   </button>
 
   <button
@@ -45,6 +45,6 @@ <h1 mat-dialog-title>Publish New Data Offer</h1>
     mat-raised-button
     [disabled]="loading || !form.group.valid"
     (click)="onCreate()">
-    Create
+    {{ 'general.create' | translate }}
   </button>
 </mat-dialog-actions>
diff --git a/src/app/routes/connector-ui/contract-definition-page/contract-definition-page.module.ts b/src/app/routes/connector-ui/contract-definition-page/contract-definition-page.module.ts
index 26db52a58..cd1361de8 100644
--- a/src/app/routes/connector-ui/contract-definition-page/contract-definition-page.module.ts
+++ b/src/app/routes/connector-ui/contract-definition-page/contract-definition-page.module.ts
@@ -1,34 +1,8 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {MatBadgeModule} from '@angular/material/badge';
-import {MatButtonModule} from '@angular/material/button';
-import {MatCardModule} from '@angular/material/card';
-import {MatCheckboxModule} from '@angular/material/checkbox';
-import {MatChipsModule} from '@angular/material/chips';
-import {MatDatepickerModule} from '@angular/material/datepicker';
-import {MatDialogModule} from '@angular/material/dialog';
-import {MatFormFieldModule} from '@angular/material/form-field';
-import {MatIconModule} from '@angular/material/icon';
-import {MatInputModule} from '@angular/material/input';
-import {MatPaginatorModule} from '@angular/material/paginator';
-import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
-import {MatSelectModule} from '@angular/material/select';
-import {MatSlideToggleModule} from '@angular/material/slide-toggle';
-import {MatStepperModule} from '@angular/material/stepper';
-import {MatTooltipModule} from '@angular/material/tooltip';
 import {RouterModule} from '@angular/router';
-import {TranslateModule} from '@ngx-translate/core';
-import {CatalogModule} from '../../../component-library/catalog/catalog.module';
-import {JsonDialogModule} from '../../../component-library/json-dialog/json-dialog.module';
-import {PipesAndDirectivesModule} from '../../../component-library/pipes-and-directives/pipes-and-directives.module';
-import {UiElementsModule} from '../../../component-library/ui-elements/ui-elements.module';
+import {SharedModule} from '../../../shared/shared.module';
 import {AssetSelectComponent} from './asset-select/asset-select.component';
 import {ContractDefinitionCardsComponent} from './contract-definition-cards/contract-definition-cards.component';
 import {ContractDefinitionEditorDialog} from './contract-definition-editor-dialog/contract-definition-editor-dialog.component';
@@ -42,30 +16,9 @@ import {PolicySelectComponent} from './policy-select/policy-select.component';
     FormsModule,
     ReactiveFormsModule,
     RouterModule,
-    TranslateModule,
-    // Angular Material
-    MatBadgeModule,
-    MatButtonModule,
-    MatCardModule,
-    MatCheckboxModule,
-    MatChipsModule,
-    MatDatepickerModule,
-    MatFormFieldModule,
-    MatProgressSpinnerModule,
-    MatSelectModule,
-    MatSlideToggleModule,
-    MatStepperModule,
-    MatTooltipModule,
-    MatPaginatorModule,
-    MatInputModule,
-    MatIconModule,
-    MatDialogModule,
 
     // EDC UI Modules
-    CatalogModule,
-    JsonDialogModule,
-    PipesAndDirectivesModule,
-    UiElementsModule,
+    SharedModule,
   ],
   declarations: [
     AssetSelectComponent,
diff --git a/src/app/routes/connector-ui/contract-definition-page/contract-definition-page/contract-definition-page.component.html b/src/app/routes/connector-ui/contract-definition-page/contract-definition-page/contract-definition-page.component.html
index 08adb129e..5d0fd5453 100644
--- a/src/app/routes/connector-ui/contract-definition-page/contract-definition-page/contract-definition-page.component.html
+++ b/src/app/routes/connector-ui/contract-definition-page/contract-definition-page/contract-definition-page.component.html
@@ -5,7 +5,9 @@
       class="search-form-field"
       appearance="outline"
       color="accent">
-      <mat-label>Search data offers</mat-label>
+      <mat-label>
+        {{ 'contract_agreement_page.search_def' | translate }}</mat-label
+      >
       <input matInput [formControl]="searchText" />
       <mat-icon matPrefix>search</mat-icon>
       <button
@@ -25,7 +27,7 @@
       style="margin-top: 8px; height: 44px"
       (click)="onCreate()">
       <mat-icon>add_circle_outline</mat-icon>
-      Publish Data Offer
+      {{ 'contract_agreement_page.create_def' | translate }}
     </button>
 
     <!-- Spacer -->
@@ -58,7 +60,7 @@
       "
       class="min-h-[35rem]"
       [emptyMessage]="
-        'No contract definition found with given filter.'
+        'contract_agreement_page.con_def' | translate
       "></empty-state>
   </div>
   <contract-definition-cards
diff --git a/src/app/routes/connector-ui/dashboard-page/dashboard-page.module.ts b/src/app/routes/connector-ui/dashboard-page/dashboard-page.module.ts
index a4395f967..baba53f70 100644
--- a/src/app/routes/connector-ui/dashboard-page/dashboard-page.module.ts
+++ b/src/app/routes/connector-ui/dashboard-page/dashboard-page.module.ts
@@ -1,36 +1,8 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
-import {ClipboardModule} from '@angular/cdk/clipboard';
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {MatBadgeModule} from '@angular/material/badge';
-import {MatButtonModule} from '@angular/material/button';
-import {MatCardModule} from '@angular/material/card';
-import {MatCheckboxModule} from '@angular/material/checkbox';
-import {MatChipsModule} from '@angular/material/chips';
-import {MatDatepickerModule} from '@angular/material/datepicker';
-import {MatDialogModule} from '@angular/material/dialog';
-import {MatFormFieldModule} from '@angular/material/form-field';
-import {MatIconModule} from '@angular/material/icon';
-import {MatInputModule} from '@angular/material/input';
-import {MatPaginatorModule} from '@angular/material/paginator';
-import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
-import {MatSelectModule} from '@angular/material/select';
-import {MatSlideToggleModule} from '@angular/material/slide-toggle';
-import {MatStepperModule} from '@angular/material/stepper';
-import {MatTooltipModule} from '@angular/material/tooltip';
 import {RouterModule} from '@angular/router';
-import {TranslateModule} from '@ngx-translate/core';
-import {NgChartsModule} from 'ng2-charts';
-import {NgxJsonViewerModule} from 'ngx-json-viewer';
-import {PipesAndDirectivesModule} from '../../../component-library/pipes-and-directives/pipes-and-directives.module';
-import {PropertyGridModule} from '../../../component-library/property-grid/property-grid.module';
-import {UiElementsModule} from '../../../component-library/ui-elements/ui-elements.module';
+import {SharedModule} from '../../../shared/shared.module';
 import {DashboardDonutChartComponent} from './dashboard-donut-chart/dashboard-donut-chart.component';
 import {DashboardKpiCardComponent} from './dashboard-kpi-card/dashboard-kpi-card.component';
 import {DashboardPageComponent} from './dashboard-page/dashboard-page.component';
@@ -42,36 +14,9 @@ import {DashboardPageComponent} from './dashboard-page/dashboard-page.component'
     FormsModule,
     ReactiveFormsModule,
     RouterModule,
-    TranslateModule,
-    // Angular CDK
-    ClipboardModule,
-
-    // Angular Material
-    MatBadgeModule,
-    MatButtonModule,
-    MatCardModule,
-    MatCheckboxModule,
-    MatChipsModule,
-    MatDatepickerModule,
-    MatFormFieldModule,
-    MatProgressSpinnerModule,
-    MatSelectModule,
-    MatSlideToggleModule,
-    MatStepperModule,
-    MatTooltipModule,
-    MatPaginatorModule,
-    MatInputModule,
-    MatIconModule,
-    MatDialogModule,
-
-    // Third Party
-    NgChartsModule,
-    NgxJsonViewerModule,
 
     // EDC UI Modules
-    PipesAndDirectivesModule,
-    PropertyGridModule,
-    UiElementsModule,
+    SharedModule,
   ],
   declarations: [
     DashboardDonutChartComponent,
diff --git a/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page-data.service.ts b/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page-data.service.ts
index a0d97d74f..47ac7f86e 100644
--- a/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page-data.service.ts
+++ b/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page-data.service.ts
@@ -1,9 +1,3 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
 import {Injectable} from '@angular/core';
 import {Observable, combineLatest, merge, of, sampleTime, scan} from 'rxjs';
 import {catchError, map} from 'rxjs/operators';
diff --git a/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page-data.ts b/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page-data.ts
index 6c9b849ad..41b9d8b7d 100644
--- a/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page-data.ts
+++ b/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page-data.ts
@@ -1,5 +1,5 @@
-import {PropertyGridGroup} from '../../../../component-library/property-grid/property-grid-group/property-grid-group';
 import {Fetched} from '../../../../core/services/models/fetched';
+import {PropertyGridGroup} from '../../../../shared/common/property-grid-group/property-grid-group';
 import {DonutChartData} from '../dashboard-donut-chart/donut-chart-data';
 
 export interface DashboardPageData {
diff --git a/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page.component.html b/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page.component.html
index 75fd3aa60..6b6e77be0 100644
--- a/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page.component.html
+++ b/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page.component.html
@@ -2,8 +2,12 @@
   <div class="grow flex flex-col gap-[16px]">
     <div class="flex flex-row gap-[16px]">
       <mat-card style="width: calc(50% - 8px)">
-        <mat-card-title>Incoming Data</mat-card-title>
-        <mat-card-subtitle>Transfer Processes</mat-card-subtitle>
+        <mat-card-title>{{
+          'dashboard_page.inc_data' | translate
+        }}</mat-card-title>
+        <mat-card-subtitle>{{
+          'dashboard_page.trans_pro' | translate
+        }}</mat-card-subtitle>
         <div class="flex flex-row justify-center items-center">
           <dashboard-donut-chart
             [data]="data.incomingTransfersChart"></dashboard-donut-chart>
@@ -11,8 +15,12 @@
       </mat-card>
 
       <mat-card style="width: calc(50% - 8px)">
-        <mat-card-title>Outgoing Data</mat-card-title>
-        <mat-card-subtitle>Transfer Processes</mat-card-subtitle>
+        <mat-card-title>{{
+          'dashboard_page.out_data' | translate
+        }}</mat-card-title>
+        <mat-card-subtitle>{{
+          'dashboard_page.trans_pro' | translate
+        }}</mat-card-subtitle>
         <div class="flex flex-row justify-center items-center">
           <dashboard-donut-chart
             [data]="data.outgoingTransfersChart"></dashboard-donut-chart>
@@ -23,33 +31,37 @@
     <div class="flex flex-row flex-wrap gap-[16px]">
       <dashboard-kpi-card
         class="flex-even-sized"
-        label="Your Contract Definitions"
+        [label]="'dashboard_page.your_def' | translate"
         [kpi]="data.numContractDefinitions"></dashboard-kpi-card>
 
       <dashboard-kpi-card
         class="flex-even-sized"
-        label="Your Assets"
+        [label]="'dashboard_page.your_assets' | translate"
         [kpi]="data.numAssets"></dashboard-kpi-card>
 
       <dashboard-kpi-card
         class="flex-even-sized"
-        label="Your Policies"
+        [label]="'dashboard_page.your_pol' | translate"
         [kpi]="data.numPolicies"></dashboard-kpi-card>
 
       <dashboard-kpi-card
         class="flex-even-sized"
-        label="Preconfigured Catalogs"
+        [label]="'dashboard_page.pre_cat' | translate"
         [kpi]="data.numCatalogs"></dashboard-kpi-card>
 
       <dashboard-kpi-card
         class="flex-even-sized"
-        label="Contract Agreements"
+        [label]="'dashboard_page.con_agree' | translate"
         [kpi]="data.numContractAgreements"></dashboard-kpi-card>
     </div>
 
     <mat-card>
-      <mat-card-title>Connector Properties</mat-card-title>
-      <mat-card-subtitle>Additional Properties</mat-card-subtitle>
+      <mat-card-title>{{
+        'dashboard_page.conn_prop' | translate
+      }}</mat-card-title>
+      <mat-card-subtitle>{{
+        'dashboard_page.add_prop' | translate
+      }}</mat-card-subtitle>
       <property-grid-group
         class="mt-[15px]"
         [propGroups]="data.connectorProperties">
@@ -59,7 +71,9 @@
 
   <div class="shrink-0 flex flex-col gap-[16px]" style="width: 420px">
     <mat-card>
-      <mat-card-title>EDC Connector</mat-card-title>
+      <mat-card-title>{{
+        'dashboard_page.edc_conn' | translate
+      }}</mat-card-title>
       <mat-card-subtitle>
         {{ data.title }}
       </mat-card-subtitle>
@@ -67,12 +81,10 @@
         {{ data.description }}
       </p>
       <p class="text-justify">
-        Share the following Connector Endpoint to let others access your EDC
-        Connector's catalog. This is especially useful when using
-        connector-restricted data offers which won't show up in brokers.
+        {{ 'dashboard_page.descrip' | translate }}
       </p>
       <mat-form-field class="w-full" style="margin-bottom: -10px">
-        <mat-label>Connector Endpoint</mat-label>
+        <mat-label>{{ 'dashboard_page.conn_end' | translate }}</mat-label>
         <input
           #input
           matInput
@@ -84,13 +96,13 @@
         <button
           mat-icon-button
           matSuffix
-          matTooltip="Copy to clipboard"
+          [matTooltip]="'tooltip.clipboard' | translate"
           [cdkCopyToClipboard]="data.connectorEndpoint">
           <mat-icon>content_copy</mat-icon>
         </button>
       </mat-form-field>
       <mat-form-field class="w-full" style="margin-bottom: -10px">
-        <mat-label>Management API URL</mat-label>
+        <mat-label>{{ 'dashboard_page.api_url' | translate }}</mat-label>
         <input
           #endpointInput
           matInput
@@ -102,7 +114,7 @@
         <button
           mat-icon-button
           matSuffix
-          matTooltip="Copy to clipboard"
+          [matTooltip]="'tooltip.clipboard' | translate"
           [cdkCopyToClipboard]="config.shownManagementApiUrl">
           <mat-icon>content_copy</mat-icon>
         </button>
@@ -121,17 +133,17 @@
             src="/assets/images/sovity_logo.svg"
             alt="sovity logo" /></span
       ></mat-card-title>
-      <mat-card-subtitle>Basic Edition EDC</mat-card-subtitle>
+      <mat-card-subtitle>{{
+        'dashboard_page.edition_edc' | translate
+      }}</mat-card-subtitle>
 
       <div class="flex flex-row h-fit">
         <div>
           <p class="text-justify mx-2">
-            This EDC Connector on the subscription level "Basic" is provided by
-            sovity to enable your first steps in the Mobility Data Space (MDS).
+            {{ 'dashboard_page.marketing_mds_basic_intro' | translate }}
           </p>
           <p class="text-justify mx-2">
-            For additional features and advanced capacities, please feel free to
-            contact us.
+            {{ 'dashboard_page.marketing_mds_basic_intro2' | translate }}
           </p>
         </div>
       </div>
@@ -141,21 +153,23 @@
           href="https://sovity.de/en/contact/"
           mat-stroked-button
           target="_blank">
-          Contact us
+          {{ 'dashboard_page.contact' | translate }}
         </a>
       </div>
     </mat-card>
 
     <mat-card *ngIf="'open-source-marketing' | isActiveFeature">
-      <mat-card-title>Get Managed EDC</mat-card-title>
-      <mat-card-subtitle>Connector-as-a-Service</mat-card-subtitle>
+      <mat-card-title>{{
+        'dashboard_page.managed_edc' | translate
+      }}</mat-card-title>
+      <mat-card-subtitle>{{
+        'dashboard_page.conn_service' | translate
+      }}</mat-card-subtitle>
       <div>
         <p class="text-justify">
-          To join data spaces like <b>Mobility Data Space</b> or
-          <b>Catena-X</b> within minutes, consider the managed solution by
+          {{ 'dashboard_page.marketing_ce_intro' | translate }}
           <a class="link" href="https://sovity.de" target="_blank">sovity</a>
-          - the <b>Connector-as-a-Service (CaaS)</b> based on open-source
-          software enriched with <b>key enterprise features</b>.
+          {{ 'dashboard_page.marketing_ce_intro2' | translate }}
         </p>
         <div class="flex flex-row !space-x-[10px]">
           <a
@@ -163,7 +177,7 @@
             href="mailto:contact@sovity.de"
             mat-flat-button
             target="_blank">
-            Contact
+            {{ 'dashboard_page.contact' | translate }}
           </a>
           <a
             color="secondary"
@@ -176,20 +190,19 @@
       </div>
     </mat-card>
     <mat-card>
-      <mat-card-title>About EDC</mat-card-title>
-      <mat-card-subtitle>Eclipse Dataspace Components</mat-card-subtitle>
+      <mat-card-title>{{ 'dashboard_page.about' | translate }}</mat-card-title>
+      <mat-card-subtitle>{{
+        'dashboard_page.eclipse' | translate
+      }}</mat-card-subtitle>
       <div>
         <p class="text-justify">
-          The <b>Eclipse Dataspace Components</b> framework facilitates
-          sovereign, inter-organizational data exchange.
+          {{ 'dashboard_page.marketing_about' | translate }}
         </p>
         <p class="text-justify">
-          It implements the <b>International Data Spaces</b> standard (IDS) as
-          well as relevant protocols associated with <b>GAIA-X</b>.
+          {{ 'dashboard_page.marketing_about2' | translate }}
         </p>
         <p class="text-justify">
-          The framework is designed as extensible as possible to encourage
-          integrations into various data ecosystems.
+          {{ 'dashboard_page.marketing_about3' | translate }}
         </p>
         <div class="flex flex-row !space-x-[10px]">
           <a
@@ -203,53 +216,105 @@
       </div>
     </mat-card>
     <mat-card>
-      <mat-card-title>About EDC UI</mat-card-title>
-      <mat-card-subtitle>Data Dashboard</mat-card-subtitle>
+      <mat-card-title>{{
+        'dashboard_page.about_ui' | translate
+      }}</mat-card-title>
+      <mat-card-subtitle>{{
+        'dashboard_page.data_dashboard' | translate
+      }}</mat-card-subtitle>
       <div>
         <p class="text-justify">
-          Example use cases, that you can try out with this application, are:
+          {{ 'dashboard_page.marketing_about_ui' | translate }}
         </p>
         <ul class="list-style-material-icons-check">
           <li>
-            View the asset catalog available to you in your Dataspace using the
-            <a class="link" [routerLink]="['/catalog-browser']"
-              >Catalog Browser</a
-            >
+            <translate-with-slot
+              key="dashboard_page.marketing_about_ui_catalog_view_offers">
+              <a
+                class="link"
+                style="display: inline"
+                [routerLink]="['/catalog-browser']">
+                {{ 'catalog_browser_page.page' | translate }}
+              </a>
+            </translate-with-slot>
           </li>
           <li>
-            Negotiate a contract for data sharing in your Dataspace using the
-            <a class="link" [routerLink]="['/catalog-browser']"
-              >Catalog Browser</a
-            >
+            <translate-with-slot
+              key="dashboard_page.marketing_about_ui_catalog_negotiate">
+              <a
+                class="link"
+                style="display: inline"
+                [routerLink]="['/catalog-browser']">
+                {{ 'catalog_browser_page.page' | translate }}
+              </a>
+            </translate-with-slot>
           </li>
           <li>
-            View your existing contracts in the
-            <a class="link" [routerLink]="['/contracts']">Contracts</a> page
+            <translate-with-slot
+              key="dashboard_page.marketing_about_ui_contracts_view_existing">
+              <a
+                class="link"
+                style="display: inline"
+                [routerLink]="['/contracts']">
+                {{ 'contract_agreement_page.page' | translate }}
+              </a>
+            </translate-with-slot>
           </li>
           <li>
-            Transfer an asset in your Dataspace using the
-            <a class="link" [routerLink]="['/contracts']">Contracts</a> page
+            <translate-with-slot
+              key="dashboard_page.marketing_about_ui_contracts_transfer">
+              <a
+                class="link"
+                style="display: inline"
+                [routerLink]="['/contracts']">
+                {{ 'contract_agreement_page.page' | translate }}
+              </a>
+            </translate-with-slot>
           </li>
           <li>
-            View which assets have been transferred in your Dataspace in the
-            <a class="link" [routerLink]="['/transfer-history']"
-              >Transfer History</a
-            >
-            page
+            <translate-with-slot
+              key="dashboard_page.marketing_about_ui_transfer_history_view">
+              <a
+                class="link"
+                style="display: inline"
+                [routerLink]="['/transfer-history']">
+                {{ 'transfer_history_page.page' | translate }}
+              </a>
+            </translate-with-slot>
           </li>
           <li>
-            View and create assets using the
-            <a class="link" [routerLink]="['/my-assets']">Assets</a> page
+            <translate-with-slot
+              key="dashboard_page.marketing_about_ui_assets_view_and_create">
+              <a
+                class="link"
+                style="display: inline"
+                [routerLink]="['/my-assets']">
+                {{ 'asset_list_page.page' | translate }}
+              </a>
+            </translate-with-slot>
           </li>
+
           <li>
-            View and create policies and apply these to assets in your Dataspace
-            using the
-            <a class="link" [routerLink]="['/policies']">Policies</a> page
+            <translate-with-slot
+              key="dashboard_page.marketing_about_ui_policies_view_and_create">
+              <a
+                class="link"
+                style="display: inline"
+                [routerLink]="['/policies']">
+                {{ 'policy_definition_page.page' | translate }}
+              </a>
+            </translate-with-slot>
           </li>
           <li>
-            Publish a new asset into your Dataspace using the
-            <a class="link" [routerLink]="['/data-offers']">Data Offers</a>
-            page
+            <translate-with-slot
+              key="dashboard_page.marketing_about_ui_contract_definitions_view_and_create">
+              <a
+                class="link"
+                style="display: inline"
+                [routerLink]="['/data-offers']">
+                {{ 'contract_definition_page.page' | translate }}
+              </a>
+            </translate-with-slot>
           </li>
         </ul>
       </div>
diff --git a/src/app/routes/connector-ui/language-selector/language-selector.component.html b/src/app/routes/connector-ui/language-selector/language-selector.component.html
deleted file mode 100644
index cd8f79a5f..000000000
--- a/src/app/routes/connector-ui/language-selector/language-selector.component.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
-  ~ Contributors:
-  ~    - Fraunhofer FIT: Internationalization and German Localization
-  -->
-
-<div class="container">
-  <mat-form-field>
-    <mat-label>{{ 'general.language' | translate }}</mat-label>
-    <div style="display: flex; align-items: center">
-      <img
-        *ngIf="selectedLanguage"
-        class="flag"
-        src="../../../../assets/images/flags/{{ selectedLanguage }}.svg"
-        alt="Selected Flag"
-        style="margin-right: 8px" />
-      <mat-select
-        [disableOptionCentering]="true"
-        [(value)]="selectedLanguage"
-        (selectionChange)="onLanguageChange()">
-        <mat-option
-          *ngFor="let language of supportedLanguages"
-          [value]="language.code">
-          <img
-            class="flag"
-            src="../../../../assets/images/flags/{{ language.code }}.svg"
-            alt="Custom Icon" />
-          {{ language.name }}
-        </mat-option>
-      </mat-select>
-    </div>
-  </mat-form-field>
-</div>
diff --git a/src/app/routes/connector-ui/language-selector/language-selector.component.scss b/src/app/routes/connector-ui/language-selector/language-selector.component.scss
deleted file mode 100644
index 15b9b70d0..000000000
--- a/src/app/routes/connector-ui/language-selector/language-selector.component.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
-
-.container {
-  top: 0px;
-  right: 0px;
-  max-width: 150px;
-  text-align: right;
-}
-
-.flag {
-  height: 1em;
-}
diff --git a/src/app/routes/connector-ui/language-selector/language-selector.component.spec.ts b/src/app/routes/connector-ui/language-selector/language-selector.component.spec.ts
deleted file mode 100644
index ab03cd2dc..000000000
--- a/src/app/routes/connector-ui/language-selector/language-selector.component.spec.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
-import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {LanguageSelectorComponent} from './language-selector.component';
-
-describe('LanguageSelectorComponent', () => {
-  let component: LanguageSelectorComponent;
-  let fixture: ComponentFixture<LanguageSelectorComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [LanguageSelectorComponent],
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(LanguageSelectorComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/routes/connector-ui/language-selector/language-selector.component.ts b/src/app/routes/connector-ui/language-selector/language-selector.component.ts
deleted file mode 100644
index c38e34998..000000000
--- a/src/app/routes/connector-ui/language-selector/language-selector.component.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
-// language-selector.component.ts
-import {Component} from '@angular/core';
-import {TranslateService} from '@ngx-translate/core';
-
-@Component({
-  selector: 'app-language-selector',
-  templateUrl: './language-selector.component.html',
-  styleUrls: ['./language-selector.component.scss'],
-})
-export class LanguageSelectorComponent {
-  supportedLanguages = [
-    {code: 'en', name: 'English'},
-    {code: 'de', name: 'Deutsch'},
-    // Add more languages as needed
-  ];
-
-  selectedLanguage!: string;
-  constructor(private translateService: TranslateService) {}
-  ngOnInit(): void {
-    // Set the initial selected language from localStorage
-    this.selectedLanguage = localStorage.getItem('selectedLanguage') || 'en';
-    this.translateService.use(this.selectedLanguage);
-  }
-
-  onLanguageChange(): void {
-    // Update selected language in localStorage
-    localStorage.setItem('selectedLanguage', this.selectedLanguage);
-
-    this.translateService.use(this.selectedLanguage);
-  }
-}
diff --git a/src/app/component-library/error-404-component/page-not-found.component.html b/src/app/routes/connector-ui/page-not-found-page/page-not-found-page.component.html
similarity index 100%
rename from src/app/component-library/error-404-component/page-not-found.component.html
rename to src/app/routes/connector-ui/page-not-found-page/page-not-found-page.component.html
diff --git a/src/app/component-library/error-404-component/page-not-found.component.ts b/src/app/routes/connector-ui/page-not-found-page/page-not-found-page.component.ts
similarity index 70%
rename from src/app/component-library/error-404-component/page-not-found.component.ts
rename to src/app/routes/connector-ui/page-not-found-page/page-not-found-page.component.ts
index 1d403c2c8..db210a297 100644
--- a/src/app/component-library/error-404-component/page-not-found.component.ts
+++ b/src/app/routes/connector-ui/page-not-found-page/page-not-found-page.component.ts
@@ -1,10 +1,10 @@
 import {Component, HostBinding} from '@angular/core';
 
 @Component({
-  selector: 'app-page-not-found',
-  templateUrl: './page-not-found.component.html',
+  selector: 'app-page-not-found-page',
+  templateUrl: './page-not-found-page.component.html',
 })
-export class PageNotFoundComponent {
+export class PageNotFoundPageComponent {
   @HostBinding('class.container')
   @HostBinding('class.flex')
   @HostBinding('class.items-center')
diff --git a/src/app/routes/connector-ui/page-not-found-page/page-not-found-page.module.ts b/src/app/routes/connector-ui/page-not-found-page/page-not-found-page.module.ts
new file mode 100644
index 000000000..3a17739ca
--- /dev/null
+++ b/src/app/routes/connector-ui/page-not-found-page/page-not-found-page.module.ts
@@ -0,0 +1,15 @@
+import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {RouterModule} from '@angular/router';
+import {PageNotFoundPageComponent} from './page-not-found-page.component';
+
+@NgModule({
+  imports: [
+    // Angular
+    CommonModule,
+    RouterModule,
+  ],
+  declarations: [PageNotFoundPageComponent],
+  exports: [PageNotFoundPageComponent],
+})
+export class PageNotFoundPageModule {}
diff --git a/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page.module.ts b/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page.module.ts
index accc15f68..84d6c92bd 100644
--- a/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page.module.ts
+++ b/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page.module.ts
@@ -1,29 +1,10 @@
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {MatBadgeModule} from '@angular/material/badge';
-import {MatButtonModule} from '@angular/material/button';
-import {MatCardModule} from '@angular/material/card';
-import {MatCheckboxModule} from '@angular/material/checkbox';
-import {MatChipsModule} from '@angular/material/chips';
-import {MatDatepickerModule} from '@angular/material/datepicker';
-import {MatDialogModule} from '@angular/material/dialog';
-import {MatDividerModule} from '@angular/material/divider';
-import {MatFormFieldModule} from '@angular/material/form-field';
-import {MatIconModule} from '@angular/material/icon';
-import {MatInputModule} from '@angular/material/input';
-import {MatMenuModule} from '@angular/material/menu';
-import {MatPaginatorModule} from '@angular/material/paginator';
-import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
-import {MatSelectModule} from '@angular/material/select';
-import {MatTooltipModule} from '@angular/material/tooltip';
 import {RouterModule} from '@angular/router';
-import {JsonDialogModule} from '../../../component-library/json-dialog/json-dialog.module';
-import {PipesAndDirectivesModule} from '../../../component-library/pipes-and-directives/pipes-and-directives.module';
-import {PolicyEditorModule} from '../../../component-library/policy-editor/policy-editor.module';
-import {UiElementsModule} from '../../../component-library/ui-elements/ui-elements.module';
-import {PolicyDefinitionCreatePageComponent} from './policy-definition-create-page/policy-definition-create-page.component';
 import {TranslateModule} from '@ngx-translate/core';
+import {SharedModule} from '../../../shared/shared.module';
+import {PolicyDefinitionCreatePageComponent} from './policy-definition-create-page/policy-definition-create-page.component';
 
 @NgModule({
   imports: [
@@ -34,29 +15,8 @@ import {TranslateModule} from '@ngx-translate/core';
     RouterModule,
     TranslateModule,
 
-    // Angular Material
-    MatBadgeModule,
-    MatButtonModule,
-    MatCardModule,
-    MatCheckboxModule,
-    MatChipsModule,
-    MatDividerModule,
-    MatDatepickerModule,
-    MatFormFieldModule,
-    MatMenuModule,
-    MatProgressSpinnerModule,
-    MatSelectModule,
-    MatTooltipModule,
-    MatPaginatorModule,
-    MatInputModule,
-    MatIconModule,
-    MatDialogModule,
-
     // EDC UI Modules
-    PolicyEditorModule,
-    UiElementsModule,
-    JsonDialogModule,
-    PipesAndDirectivesModule,
+    SharedModule,
   ],
   declarations: [PolicyDefinitionCreatePageComponent],
   exports: [PolicyDefinitionCreatePageComponent],
diff --git a/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page-form.ts b/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page-form.ts
index 1c2af7cc9..ae1432eb7 100644
--- a/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page-form.ts
+++ b/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page-form.ts
@@ -1,7 +1,7 @@
 import {Injectable} from '@angular/core';
 import {FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {ExpressionFormControls} from '../../../../component-library/policy-editor/editor/expression-form-controls';
 import {noWhitespacesOrColonsValidator} from '../../../../core/validators/no-whitespaces-or-colons-validator';
+import {ExpressionFormControls} from '../../../../shared/business/policy-editor/editor/expression-form-controls';
 import {
   PolicyDefinitionCreatePageFormModel,
   PolicyDefinitionCreatePageFormValue,
diff --git a/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page.component.html b/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page.component.html
index 115c00de4..45b862e85 100644
--- a/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page.component.html
+++ b/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page.component.html
@@ -1,5 +1,7 @@
 <div class="p-10 flex flex-col">
-  <div class="form-section-title">{{ 'policy_definition_page.metadata' | translate }}</div>
+  <div class="form-section-title">
+    {{ 'policy_definition_page.metadata' | translate }}
+  </div>
   <!--  ID -->
   <mat-form-field
     *ngIf="form.group.controls.id; let ctrl"
@@ -12,7 +14,9 @@
     }}</mat-error>
   </mat-form-field>
 
-  <div class="form-section-title">{{ 'policy_definition_page.expression' | translate }}</div>
+  <div class="form-section-title">
+    {{ 'policy_definition_page.expression' | translate }}
+  </div>
 
   <policy-form-expression
     [treeNode]="expressionFormHandler.tree.root"></policy-form-expression>
diff --git a/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page.component.ts b/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page.component.ts
index c5cf9447a..e14bb9fae 100644
--- a/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page.component.ts
+++ b/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page.component.ts
@@ -1,28 +1,21 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
 import {Component, OnDestroy} from '@angular/core';
 import {Router} from '@angular/router';
 import {Subject} from 'rxjs';
 import {finalize, takeUntil} from 'rxjs/operators';
-import {PolicyDefinitionCreateDto} from '@sovity.de/edc-client';
-import {ExpressionFormControls} from '../../../../component-library/policy-editor/editor/expression-form-controls';
-import {ExpressionFormHandler} from '../../../../component-library/policy-editor/editor/expression-form-handler';
 import {TranslateService} from '@ngx-translate/core';
+import {PolicyDefinitionCreateDto} from '@sovity.de/edc-client';
 import {EdcApiService} from '../../../../core/services/api/edc-api.service';
 import {NotificationService} from '../../../../core/services/notification.service';
 import {ValidationMessages} from '../../../../core/validators/validation-messages';
+import {ExpressionFormHandler} from '../../../../shared/business/policy-editor/editor/expression-form-handler';
+import {policyFormRequiredViewProviders} from '../../../../shared/business/policy-editor/editor/policy-form-required-providers';
 import {PolicyDefinitionCreatePageForm} from './policy-definition-create-page-form';
 
 @Component({
   selector: 'policy-definition-create-page',
   templateUrl: './policy-definition-create-page.component.html',
   viewProviders: [
-    ExpressionFormHandler,
-    ExpressionFormControls,
+    ...policyFormRequiredViewProviders,
     PolicyDefinitionCreatePageForm,
   ],
 })
@@ -54,7 +47,9 @@ export class PolicyDefinitionCreatePageComponent implements OnDestroy {
       )
       .subscribe({
         complete: () => {
-          this.notificationService.showInfo(this.translateService.instant('notification.succ_pol'));
+          this.notificationService.showInfo(
+            this.translateService.instant('notification.succ_pol'),
+          );
           this.router.navigate(['/policies']);
         },
         error: (error) => {
diff --git a/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-card-builder.ts b/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-card-builder.ts
index 58c32cd6b..11f49b8f5 100644
--- a/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-card-builder.ts
+++ b/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-card-builder.ts
@@ -1,6 +1,6 @@
 import {Injectable} from '@angular/core';
 import {PolicyDefinitionDto, PolicyDefinitionPage} from '@sovity.de/edc-client';
-import {PolicyMapper} from '../../../../component-library/policy-editor/model/policy-mapper';
+import {PolicyMapper} from '../../../../shared/business/policy-editor/model/policy-mapper';
 import {PolicyCard} from './policy-card';
 
 @Injectable({providedIn: 'root'})
diff --git a/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-card.ts b/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-card.ts
index fe7779830..1953da00a 100644
--- a/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-card.ts
+++ b/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-card.ts
@@ -1,4 +1,4 @@
-import {PolicyExpressionMapped} from '../../../../component-library/policy-editor/model/policy-expression-mapped';
+import {PolicyExpressionMapped} from '../../../../shared/business/policy-editor/model/policy-expression-mapped';
 
 export interface PolicyCard {
   id: string;
diff --git a/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.html b/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.html
index 97b26e654..9026ea10a 100644
--- a/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.html
+++ b/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.html
@@ -1,10 +1,3 @@
-<!--
-  ~ Copyright (c) 2021-2024. sovity GmbH
-  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
-  ~ Contributors:
-  ~    - Fraunhofer FIT: Internationalization and German Localization
-  -->
-
 <div class="flex flex-row flex-wrap gap-[16px] justify-start">
   <mat-card
     *ngFor="let policyCard of policyCards"
diff --git a/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.ts b/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.ts
index 6d2246348..2b0659123 100644
--- a/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.ts
+++ b/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.ts
@@ -1,9 +1,3 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
 import {
   Component,
   EventEmitter,
@@ -15,11 +9,11 @@ import {MatDialog, MatDialogRef} from '@angular/material/dialog';
 import {EMPTY} from 'rxjs';
 import {catchError, tap} from 'rxjs/operators';
 import {TranslateService} from '@ngx-translate/core';
-import {ConfirmDialogModel} from '../../../../component-library/confirmation-dialog/confirmation-dialog/confirmation-dialog.component';
-import {JsonDialogComponent} from '../../../../component-library/json-dialog/json-dialog/json-dialog.component';
-import {JsonDialogData} from '../../../../component-library/json-dialog/json-dialog/json-dialog.data';
 import {EdcApiService} from '../../../../core/services/api/edc-api.service';
 import {NotificationService} from '../../../../core/services/notification.service';
+import {ConfirmDialogModel} from '../../../../shared/common/confirmation-dialog/confirmation-dialog.component';
+import {JsonDialogComponent} from '../../../../shared/common/json-dialog/json-dialog.component';
+import {JsonDialogData} from '../../../../shared/common/json-dialog/json-dialog.data';
 import {PolicyCard} from './policy-card';
 
 @Component({
diff --git a/src/app/routes/connector-ui/policy-definition-page/policy-definition-page.module.ts b/src/app/routes/connector-ui/policy-definition-page/policy-definition-page.module.ts
index 8edb031b3..003dbeca1 100644
--- a/src/app/routes/connector-ui/policy-definition-page/policy-definition-page.module.ts
+++ b/src/app/routes/connector-ui/policy-definition-page/policy-definition-page.module.ts
@@ -1,31 +1,8 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {MatBadgeModule} from '@angular/material/badge';
-import {MatButtonModule} from '@angular/material/button';
-import {MatCardModule} from '@angular/material/card';
-import {MatCheckboxModule} from '@angular/material/checkbox';
-import {MatChipsModule} from '@angular/material/chips';
-import {MatDatepickerModule} from '@angular/material/datepicker';
-import {MatDialogModule} from '@angular/material/dialog';
-import {MatFormFieldModule} from '@angular/material/form-field';
-import {MatIconModule} from '@angular/material/icon';
-import {MatInputModule} from '@angular/material/input';
-import {MatPaginatorModule} from '@angular/material/paginator';
-import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
-import {MatSelectModule} from '@angular/material/select';
-import {MatTooltipModule} from '@angular/material/tooltip';
 import {RouterModule} from '@angular/router';
-import {TranslateModule} from '@ngx-translate/core';
-import {JsonDialogModule} from '../../../component-library/json-dialog/json-dialog.module';
-import {PolicyEditorModule} from '../../../component-library/policy-editor/policy-editor.module';
-import {UiElementsModule} from '../../../component-library/ui-elements/ui-elements.module';
+import {SharedModule} from '../../../shared/shared.module';
 import {PolicyCardsComponent} from './policy-cards/policy-cards.component';
 import {PolicyDefinitionPageComponent} from './policy-definition-page/policy-definition-page.component';
 
@@ -36,28 +13,9 @@ import {PolicyDefinitionPageComponent} from './policy-definition-page/policy-def
     FormsModule,
     ReactiveFormsModule,
     RouterModule,
-    TranslateModule,
-
-    // Angular Material
-    MatBadgeModule,
-    MatButtonModule,
-    MatCardModule,
-    MatCheckboxModule,
-    MatChipsModule,
-    MatDatepickerModule,
-    MatFormFieldModule,
-    MatProgressSpinnerModule,
-    MatSelectModule,
-    MatTooltipModule,
-    MatPaginatorModule,
-    MatInputModule,
-    MatIconModule,
-    MatDialogModule,
 
     // EDC UI Modules
-    PolicyEditorModule,
-    UiElementsModule,
-    JsonDialogModule,
+    SharedModule,
   ],
   declarations: [PolicyCardsComponent, PolicyDefinitionPageComponent],
   exports: [PolicyDefinitionPageComponent],
diff --git a/src/app/routes/connector-ui/policy-definition-page/policy-definition-page/policy-definition-page.component.html b/src/app/routes/connector-ui/policy-definition-page/policy-definition-page/policy-definition-page.component.html
index acf31d2c7..127a047de 100644
--- a/src/app/routes/connector-ui/policy-definition-page/policy-definition-page/policy-definition-page.component.html
+++ b/src/app/routes/connector-ui/policy-definition-page/policy-definition-page/policy-definition-page.component.html
@@ -1,10 +1,3 @@
-<!--
-  ~ Copyright (c) 2021-2024. sovity GmbH
-  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
-  ~ Contributors:
-  ~    - Fraunhofer FIT: Internationalization and German Localization
-  -->
-
 <div id="wrapper">
   <div class="flex flex-row">
     <!-- Search -->
diff --git a/src/app/routes/connector-ui/transfer-history-page/transfer-history-page.module.ts b/src/app/routes/connector-ui/transfer-history-page/transfer-history-page.module.ts
index 9ae6ea4f7..fe9ca4574 100644
--- a/src/app/routes/connector-ui/transfer-history-page/transfer-history-page.module.ts
+++ b/src/app/routes/connector-ui/transfer-history-page/transfer-history-page.module.ts
@@ -1,26 +1,9 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {MatButtonModule} from '@angular/material/button';
-import {MatCardModule} from '@angular/material/card';
-import {MatDialogModule} from '@angular/material/dialog';
-import {MatIconModule} from '@angular/material/icon';
-import {MatPaginatorModule} from '@angular/material/paginator';
-import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
-import {MatTableModule} from '@angular/material/table';
-import {MatTooltipModule} from '@angular/material/tooltip';
 import {RouterModule} from '@angular/router';
 import {TranslateModule} from '@ngx-translate/core';
-import {CatalogModule} from '../../../component-library/catalog/catalog.module';
-import {JsonDialogModule} from '../../../component-library/json-dialog/json-dialog.module';
-import {PipesAndDirectivesModule} from '../../../component-library/pipes-and-directives/pipes-and-directives.module';
-import {UiElementsModule} from '../../../component-library/ui-elements/ui-elements.module';
+import {SharedModule} from '../../../shared/shared.module';
 import {TransferHistoryPageComponent} from './transfer-history-page/transfer-history-page.component';
 
 @NgModule({
@@ -32,21 +15,8 @@ import {TransferHistoryPageComponent} from './transfer-history-page/transfer-his
     RouterModule,
     TranslateModule,
 
-    // Angular Material
-    MatButtonModule,
-    MatCardModule,
-    MatDialogModule,
-    MatIconModule,
-    MatPaginatorModule,
-    MatProgressSpinnerModule,
-    MatTableModule,
-    MatTooltipModule,
-
     // EDC UI Modules
-    CatalogModule,
-    JsonDialogModule,
-    PipesAndDirectivesModule,
-    UiElementsModule,
+    SharedModule,
   ],
   declarations: [TransferHistoryPageComponent],
   exports: [TransferHistoryPageComponent],
diff --git a/src/app/routes/connector-ui/transfer-history-page/transfer-history-page/transfer-history-page.component.html b/src/app/routes/connector-ui/transfer-history-page/transfer-history-page/transfer-history-page.component.html
index 6f5453346..fb547048f 100644
--- a/src/app/routes/connector-ui/transfer-history-page/transfer-history-page/transfer-history-page.component.html
+++ b/src/app/routes/connector-ui/transfer-history-page/transfer-history-page/transfer-history-page.component.html
@@ -1,10 +1,3 @@
-<!--
-  ~ Copyright (c) 2021-2024. sovity GmbH
-  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
-  ~ Contributors:
-  ~    - Fraunhofer FIT: Internationalization and German Localization
-  -->
-
 <div id="wrapper">
   <div class="flex flex-row">
     <div class="grow"></div>
@@ -131,7 +124,7 @@
       </ng-container>
       <ng-container matColumnDef="details">
         <th *matHeaderCellDef class="w-[100px]" mat-header-cell scope="col">
-          {{ 'general.detail' | translate }}
+          {{ 'general.details' | translate }}
         </th>
         <td *matCellDef="let item" class="w-[100px]" mat-cell>
           <a
diff --git a/src/app/routes/connector-ui/transfer-history-page/transfer-history-page/transfer-history-page.component.ts b/src/app/routes/connector-ui/transfer-history-page/transfer-history-page/transfer-history-page.component.ts
index eae19698a..1d002bc79 100644
--- a/src/app/routes/connector-ui/transfer-history-page/transfer-history-page/transfer-history-page.component.ts
+++ b/src/app/routes/connector-ui/transfer-history-page/transfer-history-page/transfer-history-page.component.ts
@@ -1,9 +1,3 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
 import {Component, OnDestroy, OnInit} from '@angular/core';
 import {
   EMPTY,
@@ -21,15 +15,15 @@ import {
   TransferHistoryPage,
   UiAsset,
 } from '@sovity.de/edc-client';
-import {AssetDetailDialogDataService} from '../../../../component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.service';
-import {AssetDetailDialogService} from '../../../../component-library/catalog/asset-detail-dialog/asset-detail-dialog.service';
-import {JsonDialogService} from '../../../../component-library/json-dialog/json-dialog/json-dialog.service';
 import {EdcApiService} from '../../../../core/services/api/edc-api.service';
 import {AssetBuilder} from '../../../../core/services/asset-builder';
 import {Fetched} from '../../../../core/services/models/fetched';
 import {UiAssetMapped} from '../../../../core/services/models/ui-asset-mapped';
 import {NotificationService} from '../../../../core/services/notification.service';
 import {ParticipantIdLocalization} from '../../../../core/services/participant-id-localization';
+import {AssetDetailDialogDataService} from '../../../../shared/business/asset-detail-dialog/asset-detail-dialog-data.service';
+import {AssetDetailDialogService} from '../../../../shared/business/asset-detail-dialog/asset-detail-dialog.service';
+import {JsonDialogService} from '../../../../shared/common/json-dialog/json-dialog.service';
 
 @Component({
   selector: 'transfer-history-page',
diff --git a/src/app/shared.module.ts b/src/app/shared.module.ts
deleted file mode 100644
index 494938a7f..000000000
--- a/src/app/shared.module.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {MatButtonModule} from '@angular/material/button';
-import {MatCardModule} from '@angular/material/card';
-import {MatChipsModule} from '@angular/material/chips';
-import {
-  DateAdapter,
-  MAT_DATE_LOCALE,
-  MatNativeDateModule,
-} from '@angular/material/core';
-import {MatDatepickerModule} from '@angular/material/datepicker';
-import {MatDialogModule} from '@angular/material/dialog';
-import {MatDividerModule} from '@angular/material/divider';
-import {
-  MAT_FORM_FIELD_DEFAULT_OPTIONS,
-  MatFormFieldDefaultOptions,
-  MatFormFieldModule,
-} from '@angular/material/form-field';
-import {MatIconModule} from '@angular/material/icon';
-import {MatInputModule} from '@angular/material/input';
-import {MatListModule} from '@angular/material/list';
-import {MatMenuModule} from '@angular/material/menu';
-import {MatSelectModule} from '@angular/material/select';
-import {MatSidenavModule} from '@angular/material/sidenav';
-import {MatSnackBarModule} from '@angular/material/snack-bar';
-import {MatToolbarModule} from '@angular/material/toolbar';
-import {
-  MAT_TOOLTIP_DEFAULT_OPTIONS,
-  MAT_TOOLTIP_DEFAULT_OPTIONS_FACTORY,
-  MatTooltipDefaultOptions,
-  MatTooltipModule,
-} from '@angular/material/tooltip';
-import {CustomDateAdapter} from './core/adapters/custom-date-adapter';
-
-const MODULES = [
-  MatButtonModule,
-  MatCardModule,
-  MatChipsModule,
-  MatDatepickerModule,
-  MatDialogModule,
-  MatDividerModule,
-  MatFormFieldModule,
-  MatIconModule,
-  MatInputModule,
-  MatListModule,
-  MatMenuModule,
-  MatNativeDateModule,
-  MatSelectModule,
-  MatSidenavModule,
-  MatSnackBarModule,
-  MatToolbarModule,
-  MatTooltipModule,
-];
-
-const COMPONENTS: NgModule['declarations'] = [];
-
-@NgModule({
-  imports: [
-    // Angular
-    CommonModule,
-
-    // Angular Material
-    ...MODULES,
-  ],
-  exports: [...MODULES, ...COMPONENTS],
-  declarations: COMPONENTS,
-  providers: [
-    {provide: DateAdapter, useClass: CustomDateAdapter},
-
-    {provide: MAT_DATE_LOCALE, useValue: 'en-GB'},
-    {
-      provide: MAT_FORM_FIELD_DEFAULT_OPTIONS,
-      useValue: {
-        appearance: 'outline',
-        color: 'accent',
-      } as MatFormFieldDefaultOptions,
-    },
-    {
-      provide: MAT_TOOLTIP_DEFAULT_OPTIONS,
-      useValue: <MatTooltipDefaultOptions>{
-        ...MAT_TOOLTIP_DEFAULT_OPTIONS_FACTORY(),
-        disableTooltipInteractivity: true,
-      },
-    },
-  ],
-})
-export class SharedModule {}
diff --git a/src/app/component-library/catalog/asset-card-tag-list/asset-card-tag-list.component.html b/src/app/shared/business/asset-card-tag-list/asset-card-tag-list.component.html
similarity index 100%
rename from src/app/component-library/catalog/asset-card-tag-list/asset-card-tag-list.component.html
rename to src/app/shared/business/asset-card-tag-list/asset-card-tag-list.component.html
diff --git a/src/app/component-library/catalog/asset-card-tag-list/asset-card-tag-list.component.ts b/src/app/shared/business/asset-card-tag-list/asset-card-tag-list.component.ts
similarity index 100%
rename from src/app/component-library/catalog/asset-card-tag-list/asset-card-tag-list.component.ts
rename to src/app/shared/business/asset-card-tag-list/asset-card-tag-list.component.ts
diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.service.ts b/src/app/shared/business/asset-detail-dialog/asset-detail-dialog-data.service.ts
similarity index 93%
rename from src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.service.ts
rename to src/app/shared/business/asset-detail-dialog/asset-detail-dialog-data.service.ts
index bf0505375..4680aa20d 100644
--- a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.service.ts
+++ b/src/app/shared/business/asset-detail-dialog/asset-detail-dialog-data.service.ts
@@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
-
 import {Injectable} from '@angular/core';
 import {TranslateService} from '@ngx-translate/core';
 import {DataOffer} from '../../../core/services/models/data-offer';
diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.ts b/src/app/shared/business/asset-detail-dialog/asset-detail-dialog-data.ts
similarity index 90%
rename from src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.ts
rename to src/app/shared/business/asset-detail-dialog/asset-detail-dialog-data.ts
index 550156d83..a40a6f6b5 100644
--- a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog-data.ts
+++ b/src/app/shared/business/asset-detail-dialog/asset-detail-dialog-data.ts
@@ -1,7 +1,7 @@
 import {UiAssetMapped} from 'src/app/core/services/models/ui-asset-mapped';
 import {DataOffer} from '../../../core/services/models/data-offer';
 import {ContractAgreementCardMapped} from '../../../routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-card-mapped';
-import {PropertyGridGroup} from '../../property-grid/property-grid-group/property-grid-group';
+import {PropertyGridGroup} from '../../common/property-grid-group/property-grid-group';
 
 export interface AssetDetailDialogData {
   type: 'asset-details' | 'data-offer' | 'contract-agreement';
diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog-result.ts b/src/app/shared/business/asset-detail-dialog/asset-detail-dialog-result.ts
similarity index 100%
rename from src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog-result.ts
rename to src/app/shared/business/asset-detail-dialog/asset-detail-dialog-result.ts
diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.html b/src/app/shared/business/asset-detail-dialog/asset-detail-dialog.component.html
similarity index 92%
rename from src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.html
rename to src/app/shared/business/asset-detail-dialog/asset-detail-dialog.component.html
index 42ee62df3..a4591d304 100644
--- a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.html
+++ b/src/app/shared/business/asset-detail-dialog/asset-detail-dialog.component.html
@@ -39,14 +39,14 @@
     <button
       *ngIf="data.showEditButton"
       mat-icon-button
-      matTooltip="Edit"
+      [matTooltip]="'general.edit' | translate"
       (click)="onEditClick()">
       <mat-icon class="mat-icon-[22px]">edit</mat-icon>
     </button>
     <button
       *ngIf="data.showDeleteButton"
       mat-icon-button
-      matTooltip="Delete"
+      [matTooltip]="'general.delete' | translate"
       (click)="onDeleteClick()">
       <mat-icon class="mat-icon-[22px]">delete</mat-icon>
     </button>
@@ -122,7 +122,7 @@
     <div
       class="flex flex-row flex-wrap property-grid-group-title"
       [style.margin-top.px]="30">
-      Transfer History
+      {{ 'component_library.t_history' | translate }}
     </div>
     <transfer-history-mini-list [contractAgreement]="data.contractAgreement!!">
     </transfer-history-mini-list>
@@ -171,7 +171,7 @@
 
     <div class="flex gap-1 items-center">
       <button mat-stroked-button [mat-dialog-close]="null" [disabled]="loading">
-        Close
+        {{ 'general.close' | translate }}
       </button>
 
       <ng-container
@@ -180,8 +180,8 @@
           *ngIf="data.asset.isOwnConnector"
           disabled
           mat-raised-button
-          matTooltip="Cannot negotiate contracts with your own connector.">
-          Negotiate
+          [matTooltip]="'tooltip.negotiate' | translate">
+          {{ 'component_library.negotiate' | translate }}
         </button>
 
         <button
@@ -205,12 +205,14 @@
             )
           "
           (click)="onNegotiateClick(data.dataOffer!.contractOffers[0])">
-          <ng-container *ngSwitchCase="'ready'">Negotiate</ng-container>
+          <ng-container *ngSwitchCase="'ready'">{{
+            'component_library.negotiate' | translate
+          }}</ng-container>
           <ng-container *ngSwitchCase="'negotiating'">
-            Negotiating...
+            {{ 'component_library.negotiating' | translate }}
           </ng-container>
           <ng-container *ngSwitchCase="'negotiated'">
-            Successfully Negotiated
+            {{ 'component_library.succ_negotiating' | translate }}
           </ng-container>
         </button>
       </ng-container>
@@ -234,7 +236,7 @@
         color="primary"
         [disabled]="data.contractAgreement?.isTerminated"
         (click)="onTransferClick()">
-        Transfer
+        {{ 'component_library.transfer' | translate }}
       </button>
     </div>
   </div>
diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.scss b/src/app/shared/business/asset-detail-dialog/asset-detail-dialog.component.scss
similarity index 100%
rename from src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.scss
rename to src/app/shared/business/asset-detail-dialog/asset-detail-dialog.component.scss
diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.ts b/src/app/shared/business/asset-detail-dialog/asset-detail-dialog.component.ts
similarity index 94%
rename from src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.ts
rename to src/app/shared/business/asset-detail-dialog/asset-detail-dialog.component.ts
index ebd5f2447..21fca9021 100644
--- a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.ts
+++ b/src/app/shared/business/asset-detail-dialog/asset-detail-dialog.component.ts
@@ -1,9 +1,3 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
 import {DOCUMENT} from '@angular/common';
 import {Component, Inject, OnDestroy} from '@angular/core';
 import {
@@ -30,8 +24,8 @@ import {ContractAgreementTransferDialogComponent} from '../../../routes/connecto
 import {
   ConfirmDialogModel,
   ConfirmationDialogComponent,
-} from '../../confirmation-dialog/confirmation-dialog/confirmation-dialog.component';
-import {PropertyGridGroup} from '../../property-grid/property-grid-group/property-grid-group';
+} from '../../common/confirmation-dialog/confirmation-dialog.component';
+import {PropertyGridGroup} from '../../common/property-grid-group/property-grid-group';
 import {AssetDetailDialogData} from './asset-detail-dialog-data';
 import {AssetDetailDialogResult} from './asset-detail-dialog-result';
 
@@ -205,7 +199,11 @@ export class AssetDetailDialogComponent implements OnDestroy {
   }
 
   private confirmDelete(): Observable<boolean> {
-    const dialogData = ConfirmDialogModel.forDelete('asset', this.asset.title, this.translateService);
+    const dialogData = ConfirmDialogModel.forDelete(
+      'asset',
+      this.asset.title,
+      this.translateService,
+    );
     const ref = this.matDialog.open(ConfirmationDialogComponent, {
       maxWidth: '20%',
       data: dialogData,
diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.service.ts b/src/app/shared/business/asset-detail-dialog/asset-detail-dialog.service.ts
similarity index 100%
rename from src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.service.ts
rename to src/app/shared/business/asset-detail-dialog/asset-detail-dialog.service.ts
diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts b/src/app/shared/business/asset-detail-dialog/asset-property-grid-group-builder.ts
similarity index 73%
rename from src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts
rename to src/app/shared/business/asset-detail-dialog/asset-property-grid-group-builder.ts
index 94f6974db..ffa01510e 100644
--- a/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts
+++ b/src/app/shared/business/asset-detail-dialog/asset-property-grid-group-builder.ts
@@ -1,25 +1,27 @@
 import {Injectable} from '@angular/core';
+import {TranslateService} from '@ngx-translate/core';
 import {UiPolicy} from '@sovity.de/edc-client';
 import {ActiveFeatureSet} from '../../../core/config/active-feature-set';
 import {UiAssetMapped} from '../../../core/services/models/ui-asset-mapped';
 import {ParticipantIdLocalization} from '../../../core/services/participant-id-localization';
 import {ContractAgreementCardMapped} from '../../../routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-card-mapped';
-import {ConditionsForUseDialogService} from '../../conditions-for-use-dialog/conditions-for-use-dialog/conditions-for-use-dialog.service';
-import {PropertyGridGroup} from '../../property-grid/property-grid-group/property-grid-group';
-import {PropertyGridField} from '../../property-grid/property-grid/property-grid-field';
-import {PropertyGridFieldService} from '../../property-grid/property-grid/property-grid-field.service';
-import {UrlListDialogService} from '../../url-list-dialog/url-list-dialog/url-list-dialog.service';
+import {PropertyGridGroup} from '../../common/property-grid-group/property-grid-group';
+import {PropertyGridField} from '../../common/property-grid/property-grid-field';
+import {PropertyGridFieldService} from '../../common/property-grid/property-grid-field.service';
+import {UrlListDialogService} from '../../common/url-list-dialog/url-list-dialog.service';
+import {ConditionsForUseDialogService} from '../conditions-for-use-dialog/conditions-for-use-dialog.service';
 import {PolicyPropertyFieldBuilder} from './policy-property-field-builder';
 
 @Injectable()
 export class AssetPropertyGridGroupBuilder {
   constructor(
-    private participantIdLocalization: ParticipantIdLocalization,
     private activeFeatureSet: ActiveFeatureSet,
     private propertyGridUtils: PropertyGridFieldService,
     private urlListDialogService: UrlListDialogService,
     private conditionsForUseDialogService: ConditionsForUseDialogService,
     private policyPropertyFieldBuilder: PolicyPropertyFieldBuilder,
+    private translateService: TranslateService,
+    private participantIdLocalization: ParticipantIdLocalization,
   ) {}
 
   buildAssetPropertiesGroup(
@@ -39,32 +41,34 @@ export class AssetPropertyGridGroupBuilder {
       },
       {
         icon: 'language',
-        label: 'Language',
+        label: this.translateService.instant('general.language'),
         ...this.propertyGridUtils.guessValue(asset.language?.label),
       },
       {
         icon: 'apartment',
-        label: 'Publisher',
+        label: this.translateService.instant('general.publisher'),
         ...this.propertyGridUtils.guessValue(asset.publisherHomepage),
       },
       {
         icon: 'bookmarks',
-        label: 'Endpoint Documentation',
+        label: this.translateService.instant('general.endpoint_doc'),
         ...this.propertyGridUtils.guessValue(asset.landingPageUrl),
       },
       {
         icon: 'gavel',
-        label: 'Standard License',
+        label: this.translateService.instant('general.st_license'),
         ...this.propertyGridUtils.guessValue(asset.licenseUrl),
       },
       {
         icon: 'category',
-        label: this.participantIdLocalization.participantId,
+        label: this.translateService.instant(
+          'component_library.participant_id',
+        ),
         ...this.propertyGridUtils.guessValue(asset.participantId),
       },
       {
         icon: 'account_circle',
-        label: 'Organization',
+        label: this.translateService.instant('component_library.organization'),
         ...this.propertyGridUtils.guessValue(asset.creatorOrganizationName),
       },
       this.buildConnectorEndpointField(asset.connectorEndpoint),
@@ -85,10 +89,22 @@ export class AssetPropertyGridGroupBuilder {
     const fields: PropertyGridField[] = [];
 
     const hints: {label: string; value: boolean | undefined}[] = [
-      {label: 'Method', value: asset.httpDatasourceHintsProxyMethod},
-      {label: 'Path', value: asset.httpDatasourceHintsProxyPath},
-      {label: 'Query Params', value: asset.httpDatasourceHintsProxyQueryParams},
-      {label: 'Body', value: asset.httpDatasourceHintsProxyBody},
+      {
+        label: this.translateService.instant('general.method'),
+        value: asset.httpDatasourceHintsProxyMethod,
+      },
+      {
+        label: this.translateService.instant('general.path'),
+        value: asset.httpDatasourceHintsProxyPath,
+      },
+      {
+        label: this.translateService.instant('general.params'),
+        value: asset.httpDatasourceHintsProxyQueryParams,
+      },
+      {
+        label: this.translateService.instant('general.body'),
+        value: asset.httpDatasourceHintsProxyBody,
+      },
     ];
 
     if (hints.some((hint) => hint.value != null)) {
@@ -101,7 +117,7 @@ export class AssetPropertyGridGroupBuilder {
 
       fields.push({
         icon: 'api',
-        label: 'HTTP Data Source Parameterization',
+        label: this.translateService.instant('component_library.http_param'),
         text,
       });
     }
@@ -109,7 +125,7 @@ export class AssetPropertyGridGroupBuilder {
     if (asset.mediaType) {
       fields.push({
         icon: 'category',
-        label: 'Content Type',
+        label: this.translateService.instant('general.content'),
         ...this.propertyGridUtils.guessValue(asset.mediaType),
       });
     }
@@ -153,7 +169,7 @@ export class AssetPropertyGridGroupBuilder {
 
     return [
       {
-        groupLabel: 'Additional Properties',
+        groupLabel: this.translateService.instant('general.add_properties'),
         properties: additionalProperties,
       },
       {
@@ -172,42 +188,42 @@ export class AssetPropertyGridGroupBuilder {
     if (asset.transportMode) {
       fields.push({
         icon: 'commute',
-        label: 'Transport Mode',
+        label: this.translateService.instant('general.transport'),
         ...this.propertyGridUtils.guessValue(asset.transportMode?.label),
       });
     }
     if (asset.dataCategory) {
       fields.push({
         icon: 'commute',
-        label: 'Data Category',
+        label: this.translateService.instant('general.category'),
         ...this.propertyGridUtils.guessValue(asset.dataCategory?.label),
       });
     }
     if (asset.dataSubcategory) {
       fields.push({
         icon: 'commute',
-        label: 'Data Subcategory',
+        label: this.translateService.instant('general.subcategory'),
         ...this.propertyGridUtils.guessValue(asset.dataSubcategory?.label),
       });
     }
     if (asset.dataModel) {
       fields.push({
         icon: 'category',
-        label: 'Data Model',
+        label: this.translateService.instant('general.model'),
         ...this.propertyGridUtils.guessValue(asset.dataModel),
       });
     }
     if (asset.geoReferenceMethod) {
       fields.push({
         icon: 'commute',
-        label: 'Geo Reference Method',
+        label: this.translateService.instant('general.geo_method'),
         ...this.propertyGridUtils.guessValue(asset.geoReferenceMethod),
       });
     }
     if (asset.geoLocation) {
       fields.push({
         icon: 'location_on',
-        label: 'Geo Location',
+        label: this.translateService.instant('general.geo_location'),
         ...this.propertyGridUtils.guessValue(asset.geoLocation),
       });
     }
@@ -217,7 +233,7 @@ export class AssetPropertyGridGroupBuilder {
     if (asset.sovereignLegalName) {
       fields.push({
         icon: 'account_balance',
-        label: 'Sovereign',
+        label: this.translateService.instant('general.sovereign'),
         ...this.propertyGridUtils.guessValue(asset.sovereignLegalName),
       });
     }
@@ -243,14 +259,14 @@ export class AssetPropertyGridGroupBuilder {
     if (asset.dataUpdateFrequency) {
       fields.push({
         icon: 'timelapse',
-        label: 'Data Update Frequency',
+        label: this.translateService.instant('general.frequency'),
         ...this.propertyGridUtils.guessValue(asset.dataUpdateFrequency),
       });
     }
     if (asset.temporalCoverageFrom || asset.temporalCoverageToInclusive) {
       fields.push({
         icon: 'today',
-        label: 'Temporal Coverage',
+        label: this.translateService.instant('general.coverage'),
         ...this.propertyGridUtils.guessValue(
           this.buildTemporalCoverageString(
             asset.temporalCoverageFrom,
@@ -266,7 +282,7 @@ export class AssetPropertyGridGroupBuilder {
     const properties: PropertyGridField[] = [
       {
         icon: 'category',
-        label: 'Signed',
+        label: this.translateService.instant('general.signed'),
         ...this.propertyGridUtils.guessValue(
           this.propertyGridUtils.formatDateWithTime(
             contractAgreement.contractSigningDate,
@@ -275,24 +291,32 @@ export class AssetPropertyGridGroupBuilder {
       },
       {
         icon: 'policy',
-        label: 'Direction',
-        ...this.propertyGridUtils.guessValue(contractAgreement.direction),
+        label: this.translateService.instant('general.direction'),
+        ...this.propertyGridUtils.guessValue(
+          contractAgreement.direction === 'CONSUMING'
+            ? this.translateService.instant('general.consuming')
+            : this.translateService.instant('general.providing'),
+        ),
       },
       {
         icon: 'category',
-        label: 'Contract Agreement ID',
+        label: this.translateService.instant('general.contract') + ' ID',
         ...this.propertyGridUtils.guessValue(
           contractAgreement.contractAgreementId,
         ),
       },
       {
         icon: 'link',
-        label: `Counter-Party ${this.participantIdLocalization.participantId}`,
+        label: `${this.translateService.instant('general.oth_connector')} ${
+          this.participantIdLocalization.participantId
+        }`,
         ...this.propertyGridUtils.guessValue(contractAgreement.counterPartyId),
       },
       {
         icon: 'link',
-        label: 'Counter-Party Connector Endpoint',
+        label: this.translateService.instant(
+          'transfer_history_page.counter_endpoint',
+        ),
         ...this.propertyGridUtils.guessValue(
           contractAgreement.counterPartyAddress,
         ),
@@ -308,7 +332,7 @@ export class AssetPropertyGridGroupBuilder {
     }
 
     return {
-      groupLabel: 'Contract Agreement',
+      groupLabel: this.translateService.instant('general.contract'),
       properties,
     };
   }
@@ -318,10 +342,10 @@ export class AssetPropertyGridGroupBuilder {
     subtitle: string,
   ): PropertyGridGroup {
     return {
-      groupLabel: 'Contract Policy',
+      groupLabel: this.translateService.instant('general.policy'),
       properties: this.policyPropertyFieldBuilder.buildPolicyPropertyFields(
         contractPolicy,
-        'Contract Policy JSON-LD',
+        this.translateService.instant('general.policy') + ' JSON-LD',
         subtitle,
       ),
     };
@@ -330,7 +354,7 @@ export class AssetPropertyGridGroupBuilder {
   buildConnectorEndpointField(endpoint: string): PropertyGridField {
     return {
       icon: 'link',
-      label: 'Connector Endpoint',
+      label: this.translateService.instant('general.endpoint'),
       ...this.propertyGridUtils.guessValue(endpoint),
     };
   }
@@ -338,7 +362,7 @@ export class AssetPropertyGridGroupBuilder {
   buildNutsLocationsField(locations: string[]): PropertyGridField {
     return {
       icon: 'location_on',
-      label: 'NUTS Locations',
+      label: this.translateService.instant('general.nuts'),
       text: locations.join(', '),
     };
   }
@@ -349,11 +373,11 @@ export class AssetPropertyGridGroupBuilder {
   ): PropertyGridField {
     return {
       icon: 'attachment',
-      label: 'Data Samples',
-      text: 'Show Data Samples',
+      label: this.translateService.instant('general.data'),
+      text: this.translateService.instant('general.show_data'),
       onclick: () =>
         this.urlListDialogService.showUrlListDialog({
-          title: `Data Samples`,
+          title: this.translateService.instant('general.data'),
           subtitle: title,
           icon: 'attachment',
           urls: dataSampleUrls,
@@ -367,8 +391,8 @@ export class AssetPropertyGridGroupBuilder {
   ): PropertyGridField {
     return {
       icon: 'description',
-      label: 'Conditions For Use',
-      text: 'Show Conditions For Use',
+      label: this.translateService.instant('general.conditions'),
+      text: 'Show Conditions For Use', // TODO
       onclick: () =>
         this.conditionsForUseDialogService.showConditionsForUseDialog({
           title: 'Conditions For Use',
@@ -386,11 +410,11 @@ export class AssetPropertyGridGroupBuilder {
   ): PropertyGridField {
     return {
       icon: 'receipt',
-      label: 'Reference Files',
-      text: 'Show Reference Files',
+      label: this.translateService.instant('general.files'),
+      text: this.translateService.instant('general.show_files'),
       onclick: () =>
         this.urlListDialogService.showUrlListDialog({
-          title: `Reference Files`,
+          title: this.translateService.instant('general.show_files'),
           subtitle: title,
           icon: 'receipt',
           urls: referenceFileUrls,
diff --git a/src/app/component-library/catalog/asset-detail-dialog/policy-property-field-builder.ts b/src/app/shared/business/asset-detail-dialog/policy-property-field-builder.ts
similarity index 73%
rename from src/app/component-library/catalog/asset-detail-dialog/policy-property-field-builder.ts
rename to src/app/shared/business/asset-detail-dialog/policy-property-field-builder.ts
index ec7dff5ce..67ca039a9 100644
--- a/src/app/component-library/catalog/asset-detail-dialog/policy-property-field-builder.ts
+++ b/src/app/shared/business/asset-detail-dialog/policy-property-field-builder.ts
@@ -1,15 +1,9 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
 import {Injectable} from '@angular/core';
 import {TranslateService} from '@ngx-translate/core';
 import {UiPolicy} from '@sovity.de/edc-client';
-import {JsonDialogService} from '../../json-dialog/json-dialog/json-dialog.service';
-import {PolicyMapper} from '../../policy-editor/model/policy-mapper';
-import {PropertyGridField} from '../../property-grid/property-grid/property-grid-field';
+import {JsonDialogService} from '../../common/json-dialog/json-dialog.service';
+import {PropertyGridField} from '../../common/property-grid/property-grid-field';
+import {PolicyMapper} from '../policy-editor/model/policy-mapper';
 
 @Injectable()
 export class PolicyPropertyFieldBuilder {
diff --git a/src/app/component-library/conditions-for-use-dialog/conditions-for-use-dialog/conditions-for-use-dialog.component.html b/src/app/shared/business/conditions-for-use-dialog/conditions-for-use-dialog.component.html
similarity index 100%
rename from src/app/component-library/conditions-for-use-dialog/conditions-for-use-dialog/conditions-for-use-dialog.component.html
rename to src/app/shared/business/conditions-for-use-dialog/conditions-for-use-dialog.component.html
diff --git a/src/app/component-library/conditions-for-use-dialog/conditions-for-use-dialog/conditions-for-use-dialog.component.ts b/src/app/shared/business/conditions-for-use-dialog/conditions-for-use-dialog.component.ts
similarity index 100%
rename from src/app/component-library/conditions-for-use-dialog/conditions-for-use-dialog/conditions-for-use-dialog.component.ts
rename to src/app/shared/business/conditions-for-use-dialog/conditions-for-use-dialog.component.ts
diff --git a/src/app/component-library/conditions-for-use-dialog/conditions-for-use-dialog/conditions-for-use-dialog.data.ts b/src/app/shared/business/conditions-for-use-dialog/conditions-for-use-dialog.data.ts
similarity index 100%
rename from src/app/component-library/conditions-for-use-dialog/conditions-for-use-dialog/conditions-for-use-dialog.data.ts
rename to src/app/shared/business/conditions-for-use-dialog/conditions-for-use-dialog.data.ts
diff --git a/src/app/component-library/conditions-for-use-dialog/conditions-for-use-dialog/conditions-for-use-dialog.service.ts b/src/app/shared/business/conditions-for-use-dialog/conditions-for-use-dialog.service.ts
similarity index 100%
rename from src/app/component-library/conditions-for-use-dialog/conditions-for-use-dialog/conditions-for-use-dialog.service.ts
rename to src/app/shared/business/conditions-for-use-dialog/conditions-for-use-dialog.service.ts
diff --git a/src/app/component-library/catalog/contract-offer-icon/contract-offer-icon.component.ts b/src/app/shared/business/contract-offer-icon/contract-offer-icon.component.ts
similarity index 100%
rename from src/app/component-library/catalog/contract-offer-icon/contract-offer-icon.component.ts
rename to src/app/shared/business/contract-offer-icon/contract-offer-icon.component.ts
diff --git a/src/app/component-library/catalog/contract-offer-mini-list/contract-offer-mini-list.component.html b/src/app/shared/business/contract-offer-mini-list/contract-offer-mini-list.component.html
similarity index 87%
rename from src/app/component-library/catalog/contract-offer-mini-list/contract-offer-mini-list.component.html
rename to src/app/shared/business/contract-offer-mini-list/contract-offer-mini-list.component.html
index 795648091..0e2fa994b 100644
--- a/src/app/component-library/catalog/contract-offer-mini-list/contract-offer-mini-list.component.html
+++ b/src/app/shared/business/contract-offer-mini-list/contract-offer-mini-list.component.html
@@ -1,10 +1,3 @@
-<!--
-  ~ Copyright (c) 2021-2024. sovity GmbH
-  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
-  ~ Contributors:
-  ~    - Fraunhofer FIT: Internationalization and German Localization
-  -->
-
 <ng-container *ngIf="!data.contractOffers.length">
   <div class="flex flex-row flex-wrap property-grid-group-title">
     Contract Offers
@@ -69,7 +62,7 @@
       *ngIf="data.asset.isOwnConnector"
       disabled
       mat-raised-button
-      matTooltip="{{ 'tooltip.negotiate' | translate }}">
+      [matTooltip]="'tooltip.negotiate' | translate">
       {{ 'component_library.negotiate' | translate }}
     </button>
   </div>
diff --git a/src/app/component-library/catalog/contract-offer-mini-list/contract-offer-mini-list.component.ts b/src/app/shared/business/contract-offer-mini-list/contract-offer-mini-list.component.ts
similarity index 91%
rename from src/app/component-library/catalog/contract-offer-mini-list/contract-offer-mini-list.component.ts
rename to src/app/shared/business/contract-offer-mini-list/contract-offer-mini-list.component.ts
index 3c09ee309..2d664d9e1 100644
--- a/src/app/component-library/catalog/contract-offer-mini-list/contract-offer-mini-list.component.ts
+++ b/src/app/shared/business/contract-offer-mini-list/contract-offer-mini-list.component.ts
@@ -8,7 +8,7 @@ import {
 import {DataOffer} from 'src/app/core/services/models/data-offer';
 import {ContractNegotiationService} from '../../../core/services/contract-negotiation.service';
 import {ContractOffer} from '../../../core/services/models/contract-offer';
-import {PropertyGridField} from '../../property-grid/property-grid/property-grid-field';
+import {PropertyGridField} from '../../common/property-grid/property-grid-field';
 
 @Component({
   selector: 'contract-offer-mini-list',
diff --git a/src/app/component-library/catalog/data-offer-cards/data-offer-cards.component.html b/src/app/shared/business/data-offer-cards/data-offer-cards.component.html
similarity index 100%
rename from src/app/component-library/catalog/data-offer-cards/data-offer-cards.component.html
rename to src/app/shared/business/data-offer-cards/data-offer-cards.component.html
diff --git a/src/app/component-library/catalog/data-offer-cards/data-offer-cards.component.ts b/src/app/shared/business/data-offer-cards/data-offer-cards.component.ts
similarity index 100%
rename from src/app/component-library/catalog/data-offer-cards/data-offer-cards.component.ts
rename to src/app/shared/business/data-offer-cards/data-offer-cards.component.ts
diff --git a/src/app/shared/business/edit-asset-form/edit-asset-form-required-providers.ts b/src/app/shared/business/edit-asset-form/edit-asset-form-required-providers.ts
new file mode 100644
index 000000000..d75efc586
--- /dev/null
+++ b/src/app/shared/business/edit-asset-form/edit-asset-form-required-providers.ts
@@ -0,0 +1,17 @@
+import {AssetRequestBuilder} from 'src/app/core/services/asset-request-builder';
+import {policyFormRequiredViewProviders} from '../policy-editor/editor/policy-form-required-providers';
+import {AssetAdvancedFormBuilder} from './form/asset-advanced-form-builder';
+import {AssetDatasourceFormBuilder} from './form/asset-datasource-form-builder';
+import {AssetGeneralFormBuilder} from './form/asset-general-form-builder';
+import {EditAssetForm} from './form/edit-asset-form';
+import {EditAssetFormInitializer} from './form/edit-asset-form-initializer';
+
+export const editAssetFormRequiredViewProviders = [
+  EditAssetFormInitializer,
+  AssetRequestBuilder,
+  EditAssetForm,
+  AssetGeneralFormBuilder,
+  AssetDatasourceFormBuilder,
+  AssetAdvancedFormBuilder,
+  ...policyFormRequiredViewProviders,
+];
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/edit-asset-form.component.html b/src/app/shared/business/edit-asset-form/edit-asset-form.component.html
similarity index 87%
rename from src/app/component-library/edit-asset-form/edit-asset-form/edit-asset-form.component.html
rename to src/app/shared/business/edit-asset-form/edit-asset-form.component.html
index c0c1d5940..759dcdf84 100644
--- a/src/app/component-library/edit-asset-form/edit-asset-form/edit-asset-form.component.html
+++ b/src/app/shared/business/edit-asset-form/edit-asset-form.component.html
@@ -2,13 +2,13 @@
   <form class="flex flex-col gap-y-12 mt-4" [formGroup]="form.all">
     <edit-asset-form-group
       *ngIf="form.datasource"
-      myTitle="Datasource"
-      description="Define the datasource of the asset">
+      [myTitle]="'asset_list_page.datasource' | translate"
+      [description]="'create_data_offer.def_datasrc' | translate">
       <!-- Datasource Type -->
       <div *ngIf="multipleDataSourceOptionsAvailable()">
         <edit-asset-form-label
-          label="Datasource Type"
           htmlFor="create-asset-form-datasource-type"
+          [label]="'create_data_offer.data_type' | translate"
           [ctrl]="
             form.datasource.controls.dataSourceAvailability
           "></edit-asset-form-label>
@@ -36,12 +36,14 @@
         <edit-asset-form-input
           class="mt-2"
           fieldId="create-asset-form-contact-email"
-          label="Contact E-Mail"
-          placeholder="contact@my-org.com"
+          placeholder="{{
+            'create_data_offer.contact_email_placeholder' | translate
+          }}"
+          [label]="'create_data_offer.contact_email' | translate"
           [ctrl]="form.datasource.controls.contactEmail"
-          >This email address will be offered to potential consumers for
-          contacting you. This is done in place of having an actual data source
-          connected.</edit-asset-form-input
+          >{{
+            'create_data_offer.contact_email_descr' | translate
+          }}</edit-asset-form-input
         >
 
         <!-- Contact E-Mail Subject for On Request Assets -->
@@ -63,8 +65,8 @@
         <!-- Data Address Type -->
         <div class="mt-5">
           <edit-asset-form-data-address-type-select
-            label="Type"
             mode="Datasource-Create"
+            [label]="'general.type' | translate"
             [control]="form.datasource.controls.dataAddressType">
           </edit-asset-form-data-address-type-select>
         </div>
@@ -86,8 +88,8 @@
           <!-- Method (Rest-Api) -->
           <div>
             <edit-asset-form-label
-              label="Http Method"
               htmlFor="create-asset-form-http-method"
+              [label]="'general.method' | translate"
               [ctrl]="
                 form.datasource.controls.httpMethod
               "></edit-asset-form-label>
@@ -102,9 +104,8 @@
                 </mat-option>
               </mat-select>
               <mat-hint class="mat-hint">
-                The consuming side <b>must</b> provide a Custom HTTP Method with
-                method parameterization enabled.</mat-hint
-              >
+                {{ 'asset_list_page.provide' | translate }}
+              </mat-hint>
             </mat-form-field>
             <!-- Toggle Method Parametrization Button -->
             <div
@@ -115,8 +116,12 @@
                 mat-button
                 [color]="ctrl.value ? 'warn' : 'accent'"
                 (click)="$event.preventDefault(); ctrl.setValue(!ctrl.value)">
-                {{ ctrl.value ? 'Disable' : 'Enable' }}
-                Method Parameterization
+                {{
+                  ctrl.value
+                    ? ('general.disable' | translate)
+                    : ('general.enable' | translate)
+                }}
+                {{ 'asset_list_page.method_para' | translate }}
               </button>
             </div>
           </div>
@@ -129,10 +134,8 @@
               [hideHint]="!form.proxyPath"
               [ctrl]="ctrl"
               [label]="form.proxyPath ? 'Base URL' : 'URL'"
-              >The consuming side <b>must</b> provide a Custom HTTP Subpath with
-              method parameterization enabled. The Custom HTTP Subpath will be
-              appended to the base path.</edit-asset-form-input
-            >
+              >{{ 'asset_list_page.http_subpath' | translate }}
+            </edit-asset-form-input>
 
             <!-- Toggle Proxy Path Button -->
             <div
@@ -142,7 +145,12 @@
                 mat-button
                 [color]="ctrl.value ? 'warn' : 'accent'"
                 (click)="$event.preventDefault(); ctrl.setValue(!ctrl.value)">
-                {{ ctrl.value ? 'Disable' : 'Enable' }} Path Parameterization
+                {{
+                  ctrl.value
+                    ? ('general.disable' | translate)
+                    : ('general.enable' | translate)
+                }}
+                {{ 'asset_list_page.method_para' | translate }}
               </button>
             </div>
           </div>
@@ -150,7 +158,8 @@
           <div class="mt-3">
             <edit-asset-form-label
               [label]="
-                (form.proxyQueryParams ? 'Default' : '') + ' Query Params'
+                (form.proxyQueryParams ? 'Default' : '') +
+                ('asset_list_page.query_para' | translate)
               "></edit-asset-form-label>
             <div class="mt-6"></div>
             <div
@@ -161,10 +170,9 @@
               class="flex flex-row space-x-[10px] -mt-3">
               <!-- Query Param Name -->
               <mat-form-field class="w-1/3">
-                <mat-label>Name</mat-label>
                 <input
                   matInput
-                  placeholder="key"
+                  placeholder="q"
                   required
                   autocomplete="new-query-param-name"
                   [formControl]="header.controls.paramName" />
@@ -179,7 +187,6 @@
               </mat-form-field>
               <!-- Query Param Value -->
               <mat-form-field class="grow">
-                <mat-label>Value</mat-label>
                 <input
                   matInput
                   placeholder="..."
@@ -200,7 +207,7 @@
                 color="warn"
                 style="height: 42px; margin-top: 4px; margin-left: 8px"
                 (click)="form.onHttpQueryParamsRemoveClick($event, i)">
-                Remove
+                {{ 'general.remove' | translate }}
               </button>
             </div>
             <mat-hint *ngIf="form.proxyQueryParams" class="mat-hint">
@@ -214,7 +221,9 @@
                 mat-button
                 color="accent"
                 (click)="form.onHttpQueryParamsAddClick($event)">
-                Add {{ form.proxyQueryParams ? 'Default' : '' }} Query Param
+                {{ 'general.add' | translate }}
+                {{ form.proxyQueryParams ? 'Default' : '' }}
+                {{ 'asset_list_page.query_para_single' | translate }}
               </button>
               <!-- Toggle Proxy Query Param Parameterization Button -->
               <button
@@ -222,17 +231,23 @@
                 mat-button
                 [color]="ctrl.value ? 'warn' : 'accent'"
                 (click)="$event.preventDefault(); ctrl.setValue(!ctrl.value)">
-                {{ ctrl.value ? 'Disable' : 'Enable' }} Query Param
-                Parameterization
+                {{
+                  ctrl.value
+                    ? ('general.disable' | translate)
+                    : ('general.enable' | translate)
+                }}
+                {{ 'asset_list_page.query_parameter' | translate }}
               </button>
             </div>
           </div>
 
           <div class="flex flex-col gap-1 mt-3">
-            <edit-asset-form-label label="Request Body"></edit-asset-form-label>
+            <edit-asset-form-label
+              label="{{
+                'asset_list_page.request_body' | translate
+              }}"></edit-asset-form-label>
             <mat-hint class="mat-hint">
-              The request body can only be set from the consumer side, if
-              parameterization is enabled.
+              {{ 'asset_list_page.info_body' | translate }}
             </mat-hint>
             <!-- Toggle Proxy Body Button -->
             <div
@@ -242,15 +257,19 @@
                 mat-button
                 [color]="ctrl.value ? 'warn' : 'accent'"
                 (click)="$event.preventDefault(); ctrl.setValue(!ctrl.value)">
-                {{ ctrl.value ? 'Disable' : 'Enable' }} Request Body
-                Parameterization
+                {{
+                  ctrl.value
+                    ? ('general.disable' | translate)
+                    : ('general.enable' | translate)
+                }}
+                {{ 'asset_list_page.request_para' | translate }}
               </button>
             </div>
           </div>
 
           <div class="flex flex-col gap-1 mt-3">
             <edit-asset-form-label
-              label="Authentication"></edit-asset-form-label>
+              [label]="'general.auth' | translate"></edit-asset-form-label>
             <!-- Add Authentication Button -->
             <div
               *ngIf="
@@ -265,7 +284,7 @@
                     'Vault-Secret'
                   )
                 ">
-                Add Authentication
+                {{ 'general.add' | translate }} {{ 'general.auth' | translate }}
               </button>
             </div>
             <!-- Auth Header Value Type -->
@@ -274,13 +293,15 @@
                 form.datasource.controls.httpAuthHeaderType.value !== 'None'
               "
               class="grow mt-4">
-              <mat-label>Type</mat-label>
+              <mat-label>{{ 'general.type' | translate }}</mat-label>
               <mat-select
                 [formControl]="form.datasource.controls.httpAuthHeaderType">
                 <mat-option value="Vault-Secret">
-                  Header with Vault Secret
+                  {{ 'general.header_sec' | translate }}
                 </mat-option>
-                <mat-option value="Value">Header with Value</mat-option>
+                <mat-option value="Value">{{
+                  'general.header_val' | translate
+                }}</mat-option>
               </mat-select>
             </mat-form-field>
             <div
@@ -290,7 +311,6 @@
               class="flex flex-row space-x-[10px] -mt-3">
               <!-- Auth Header Name -->
               <mat-form-field class="w-1/3">
-                <mat-label>Auth Header Name</mat-label>
                 <input
                   matInput
                   placeholder="Authorization"
@@ -303,7 +323,6 @@
                   form.datasource.controls.httpAuthHeaderType.value === 'Value'
                 "
                 class="grow">
-                <mat-label>Auth Header Value</mat-label>
                 <input
                   matInput
                   placeholder="Bearer ..."
@@ -318,7 +337,7 @@
                   'Vault-Secret'
                 "
                 class="grow">
-                <mat-label>Vault Secret Name</mat-label>
+                <mat-label>{{ 'general.vault_secret' | translate }}</mat-label>
                 <input
                   matInput
                   placeholder="MySecret123"
@@ -339,14 +358,17 @@
                 (click)="
                   form.datasource.controls.httpAuthHeaderType.setValue('None')
                 ">
-                Remove Authentication
+                {{ 'general.remove' | translate }}
+                {{ 'general.auth' | translate }}
               </button>
             </div>
           </div>
 
           <div class="mt-4">
             <edit-asset-form-label
-              label="Additional Headers"></edit-asset-form-label>
+              label="{{
+                'general.add_header' | translate
+              }}"></edit-asset-form-label>
             <div class="mt-8"></div>
             <div
               *ngFor="
@@ -356,16 +378,14 @@
               class="flex flex-row space-x-[10px] -mt-3">
               <!-- Header Name -->
               <mat-form-field class="w-1/3">
-                <mat-label>Header Name</mat-label>
                 <input
                   matInput
-                  placeholder="Header"
+                  placeholder="Accept"
                   autocomplete="new-header-name"
                   [formControl]="header.controls.headerName" />
               </mat-form-field>
               <!-- Header Value -->
               <mat-form-field class="grow">
-                <mat-label>Header Value</mat-label>
                 <input
                   matInput
                   placeholder="..."
@@ -378,7 +398,7 @@
                 color="warn"
                 style="height: 42px; margin-top: 4px; margin-left: 8px"
                 (click)="form.onHttpHeadersRemoveClick($event, i)">
-                Remove
+                {{ 'general.remove' | translate }}
               </button>
             </div>
             <!-- Add Header Button -->
@@ -387,7 +407,8 @@
                 mat-button
                 color="accent"
                 (click)="form.onHttpHeadersAddClick($event)">
-                Add Additional Header
+                {{ 'general.add' | translate }}
+                {{ 'general.add_header' | translate }}
               </button>
             </div>
           </div>
@@ -396,35 +417,35 @@
     </edit-asset-form-group>
 
     <edit-asset-form-group
-      myTitle="General Information"
-      description="Fill out general information about the asset">
+      [myTitle]="'asset_list_page.information' | translate"
+      [description]="'asset_list_page.information_desc' | translate">
       <!-- Title -->
       <edit-asset-form-input
         fieldId="create-asset-form-name"
-        label="Title"
-        placeholder="My Asset"
         tooltip="The main title of your asset. It will also be the title of the data offering displayed in the catalog."
+        [label]="'asset_list_page.name' | translate"
+        [placeholder]="'asset_list_page.my_asset' | translate"
         [ctrl]="form.general.controls.name"></edit-asset-form-input>
 
       <!-- Asset ID -->
       <edit-asset-form-input
         *ngIf="form.general.controls.id; let ctrl"
         fieldId="create-asset-form-id"
-        placeholder="Asset ID"
-        label="Asset ID"
         tooltip="Asset ID, used internally, is an auto-generated string in a URL-compatible format, combining the asset name and version with a urn:artifact: prefix. You can customize it if needed."
+        [placeholder]="'asset_list_page.asset_id' | translate"
+        [label]="'asset_list_page.asset_id' | translate"
         [ctrl]="ctrl"></edit-asset-form-input>
 
       <!-- Description -->
       <edit-asset-form-textarea
-        label="Description"
         fieldId="create-asset-form-description"
+        [label]="'asset_list_page.file_des' | translate"
         [placeholder]="
           '# My Asset\n\nAt vero eos et accusam et justo duo dolores et ea rebum.\n\n## Details\n\nAt vero eos et accusam et justo duo dolores et ea **rebum**.'
         "
         [ctrl]="form.general.controls.description">
         <div class="flex flex-row items-center gap-1 mb-1">
-          The description supports
+          {{ 'asset_list_page.descrip' | translate }}
           <a
             class="link"
             externalLink
@@ -437,28 +458,28 @@
       <!-- Keywords -->
       <div class="mt-3">
         <keyword-select
-          label="Keywords"
+          [label]="'asset_list_page.keywords' | translate"
           [control]="form.general.controls.keywords"></keyword-select>
       </div>
 
       <!-- Show Advanced Fields -->
-      <mat-checkbox [formControl]="form.general.controls.showAdvancedFields"
-        >Show Advanced Fields</mat-checkbox
-      >
+      <mat-checkbox [formControl]="form.general.controls.showAdvancedFields">{{
+        'general.show_adv_fields' | translate
+      }}</mat-checkbox>
 
       <ng-container *ngIf="form.general.value.showAdvancedFields">
         <!-- Version -->
         <edit-asset-form-input
           class="mt-4"
-          label="Version"
           fieldId="create-asset-form-version"
           placeholder="1.0.0"
           tooltip="The version of your asset. Especially useful if you have iterations of the same asset."
+          [label]="'asset_list_page.version' | translate"
           [ctrl]="form.general.controls.version"></edit-asset-form-input>
 
         <!-- Language -->
         <language-select
-          label="Language of the content"
+          [label]="'general.language' | translate"
           [control]="form.general.controls.language"></language-select>
       </ng-container>
     </edit-asset-form-group>
@@ -505,8 +526,8 @@
 
     <edit-asset-form-group
       *ngIf="form.general.value.showAdvancedFields"
-      myTitle="Documentation"
-      description="Provide context information about the datasource">
+      description="Provide context information about the datasource"
+      [myTitle]="'general.doc' | translate">
       <!-- Endpoint Documentation -->
       <edit-asset-form-input
         label="Endpoint Documentation"
@@ -796,20 +817,20 @@
 
     <edit-asset-form-group
       *ngIf="form.mode === 'CREATE'"
-      myTitle="Publishing"
-      description="Publish data offer to other data space participants">
+      [myTitle]="'general.publishing' | translate"
+      [description]="'general.pub_desc' | translate">
       <!-- Publish Mode -->
       <div *ngIf="form.all.controls.publishMode; let ctrl">
         <edit-asset-form-label
-          label="Publishing Mode"
           htmlFor="create-asset-form-publish-type"
+          [label]="'general.pub_mode' | translate"
           [ctrl]="ctrl"></edit-asset-form-label>
         <mat-radio-group
           class="!flex !flex-col !gap-1 w-full mt-2"
           aria-label="Select an option"
           [formControl]="ctrl">
           <mat-radio-button value="PUBLISH_UNRESTRICTED">
-            Publish unrestricted
+            {{ 'general.pub_unrestr' | translate }}
             <button
               class="!scale-[0.9]"
               mat-icon-button
@@ -820,7 +841,7 @@
             </button>
           </mat-radio-button>
           <mat-radio-button value="PUBLISH_RESTRICTED">
-            Publish restricted
+            {{ 'general.pub_restr' | translate }}
             <button
               class="!scale-[0.9]"
               mat-icon-button
@@ -847,7 +868,7 @@
       <!-- Policy Expression -->
       <div *ngIf="form.all.controls.publishMode.value === 'PUBLISH_RESTRICTED'">
         <edit-asset-form-label
-          label="Policy Expression"
+          [label]="'policy_definition_page.expression' | translate"
           [ctrl]="form.all.controls.policyControls"></edit-asset-form-label>
         <policy-form-expression
           [treeNode]="expressionFormHandler.tree.root"></policy-form-expression>
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/edit-asset-form.component.ts b/src/app/shared/business/edit-asset-form/edit-asset-form.component.ts
similarity index 91%
rename from src/app/component-library/edit-asset-form/edit-asset-form/edit-asset-form.component.ts
rename to src/app/shared/business/edit-asset-form/edit-asset-form.component.ts
index b667ba315..d8aa7c3ac 100644
--- a/src/app/component-library/edit-asset-form/edit-asset-form/edit-asset-form.component.ts
+++ b/src/app/shared/business/edit-asset-form/edit-asset-form.component.ts
@@ -1,7 +1,7 @@
 import {Component, EventEmitter, Input, Output} from '@angular/core';
 import {ActiveFeatureSet} from 'src/app/core/config/active-feature-set';
 import {ValidationMessages} from 'src/app/core/validators/validation-messages';
-import {ExpressionFormHandler} from '../../policy-editor/editor/expression-form-handler';
+import {ExpressionFormHandler} from '../policy-editor/editor/expression-form-handler';
 import {EditAssetForm} from './form/edit-asset-form';
 import {DATA_SOURCE_HTTP_METHODS} from './form/http-methods';
 
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/form/asset-advanced-form-builder.ts b/src/app/shared/business/edit-asset-form/form/asset-advanced-form-builder.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form/form/asset-advanced-form-builder.ts
rename to src/app/shared/business/edit-asset-form/form/asset-advanced-form-builder.ts
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/form/asset-datasource-form-builder.ts b/src/app/shared/business/edit-asset-form/form/asset-datasource-form-builder.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form/form/asset-datasource-form-builder.ts
rename to src/app/shared/business/edit-asset-form/form/asset-datasource-form-builder.ts
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/form/asset-general-form-builder.ts b/src/app/shared/business/edit-asset-form/form/asset-general-form-builder.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form/form/asset-general-form-builder.ts
rename to src/app/shared/business/edit-asset-form/form/asset-general-form-builder.ts
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/form/edit-asset-form-initializer.ts b/src/app/shared/business/edit-asset-form/form/edit-asset-form-initializer.ts
similarity index 97%
rename from src/app/component-library/edit-asset-form/edit-asset-form/form/edit-asset-form-initializer.ts
rename to src/app/shared/business/edit-asset-form/form/edit-asset-form-initializer.ts
index 8ef1729ff..1aafcfa42 100644
--- a/src/app/component-library/edit-asset-form/edit-asset-form/form/edit-asset-form-initializer.ts
+++ b/src/app/shared/business/edit-asset-form/form/edit-asset-form-initializer.ts
@@ -1,7 +1,7 @@
 import {Injectable} from '@angular/core';
 import {ActiveFeatureSet} from 'src/app/core/config/active-feature-set';
 import {UiAssetMapped} from 'src/app/core/services/models/ui-asset-mapped';
-import {LanguageSelectItemService} from '../../language-select/language-select-item.service';
+import {LanguageSelectItemService} from '../../../form-elements/language-select/language-select-item.service';
 import {AssetDatasourceFormValue} from './model/asset-datasource-form-model';
 import {EditAssetFormValue} from './model/edit-asset-form-model';
 
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/form/edit-asset-form-validators.ts b/src/app/shared/business/edit-asset-form/form/edit-asset-form-validators.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form/form/edit-asset-form-validators.ts
rename to src/app/shared/business/edit-asset-form/form/edit-asset-form-validators.ts
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/form/edit-asset-form.ts b/src/app/shared/business/edit-asset-form/form/edit-asset-form.ts
similarity index 96%
rename from src/app/component-library/edit-asset-form/edit-asset-form/form/edit-asset-form.ts
rename to src/app/shared/business/edit-asset-form/form/edit-asset-form.ts
index 8fe810fca..8500040b8 100644
--- a/src/app/component-library/edit-asset-form/edit-asset-form/form/edit-asset-form.ts
+++ b/src/app/shared/business/edit-asset-form/form/edit-asset-form.ts
@@ -1,10 +1,10 @@
 import {Injectable} from '@angular/core';
 import {FormBuilder, FormGroup} from '@angular/forms';
 import {delay} from 'rxjs/operators';
-import {ExpressionFormControls} from 'src/app/component-library/policy-editor/editor/expression-form-controls';
 import {ActiveFeatureSet} from 'src/app/core/config/active-feature-set';
 import {switchDisabledControls} from 'src/app/core/utils/form-group-utils';
-import {DataCategorySelectItem} from '../../data-category-select/data-category-select-item';
+import {DataCategorySelectItem} from '../../../form-elements/data-category-select/data-category-select-item';
+import {ExpressionFormControls} from '../../policy-editor/editor/expression-form-controls';
 import {AssetAdvancedFormBuilder} from './asset-advanced-form-builder';
 import {AssetDatasourceFormBuilder} from './asset-datasource-form-builder';
 import {AssetGeneralFormBuilder} from './asset-general-form-builder';
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/http-methods.ts b/src/app/shared/business/edit-asset-form/form/http-methods.ts
similarity index 100%
rename from src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/http-methods.ts
rename to src/app/shared/business/edit-asset-form/form/http-methods.ts
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/form/model/always-true-policy-id.ts b/src/app/shared/business/edit-asset-form/form/model/always-true-policy-id.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form/form/model/always-true-policy-id.ts
rename to src/app/shared/business/edit-asset-form/form/model/always-true-policy-id.ts
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/form/model/asset-advanced-form-model.ts b/src/app/shared/business/edit-asset-form/form/model/asset-advanced-form-model.ts
similarity index 89%
rename from src/app/component-library/edit-asset-form/edit-asset-form/form/model/asset-advanced-form-model.ts
rename to src/app/shared/business/edit-asset-form/form/model/asset-advanced-form-model.ts
index 4c9c803ac..af1e551fe 100644
--- a/src/app/component-library/edit-asset-form/edit-asset-form/form/model/asset-advanced-form-model.ts
+++ b/src/app/shared/business/edit-asset-form/form/model/asset-advanced-form-model.ts
@@ -4,7 +4,7 @@ import {
   FormGroup,
   ɵFormGroupValue,
 } from '@angular/forms';
-import {TransportModeSelectItem} from '../../../transport-mode-select/transport-mode-select-item';
+import {TransportModeSelectItem} from '../../../../form-elements/transport-mode-select/transport-mode-select-item';
 import {TemporalCoverageFormModel} from './temporal-coverage-form-model';
 
 /**
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/form/model/asset-datasource-form-enabled-ctrls.ts b/src/app/shared/business/edit-asset-form/form/model/asset-datasource-form-enabled-ctrls.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form/form/model/asset-datasource-form-enabled-ctrls.ts
rename to src/app/shared/business/edit-asset-form/form/model/asset-datasource-form-enabled-ctrls.ts
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/form/model/asset-datasource-form-model.ts b/src/app/shared/business/edit-asset-form/form/model/asset-datasource-form-model.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form/form/model/asset-datasource-form-model.ts
rename to src/app/shared/business/edit-asset-form/form/model/asset-datasource-form-model.ts
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/form/model/asset-edit-dialog-mode.ts b/src/app/shared/business/edit-asset-form/form/model/asset-edit-dialog-mode.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form/form/model/asset-edit-dialog-mode.ts
rename to src/app/shared/business/edit-asset-form/form/model/asset-edit-dialog-mode.ts
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/form/model/asset-general-form-model.ts b/src/app/shared/business/edit-asset-form/form/model/asset-general-form-model.ts
similarity index 71%
rename from src/app/component-library/edit-asset-form/edit-asset-form/form/model/asset-general-form-model.ts
rename to src/app/shared/business/edit-asset-form/form/model/asset-general-form-model.ts
index 67fdf44ab..d059c8e09 100644
--- a/src/app/component-library/edit-asset-form/edit-asset-form/form/model/asset-general-form-model.ts
+++ b/src/app/shared/business/edit-asset-form/form/model/asset-general-form-model.ts
@@ -1,7 +1,7 @@
 import {FormControl, ɵFormGroupValue} from '@angular/forms';
-import {DataCategorySelectItem} from '../../../data-category-select/data-category-select-item';
-import {DataSubcategorySelectItem} from '../../../data-subcategory-select/data-subcategory-select-item';
-import {LanguageSelectItem} from '../../../language-select/language-select-item';
+import {DataCategorySelectItem} from '../../../../form-elements/data-category-select/data-category-select-item';
+import {DataSubcategorySelectItem} from '../../../../form-elements/data-subcategory-select/data-subcategory-select-item';
+import {LanguageSelectItem} from '../../../../form-elements/language-select/language-select-item';
 
 /**
  * Form Model for Edit Asset Form > General
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/form/model/data-address.ts b/src/app/shared/business/edit-asset-form/form/model/data-address.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form/form/model/data-address.ts
rename to src/app/shared/business/edit-asset-form/form/model/data-address.ts
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/form/model/data-offer-publish-mode.ts b/src/app/shared/business/edit-asset-form/form/model/data-offer-publish-mode.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form/form/model/data-offer-publish-mode.ts
rename to src/app/shared/business/edit-asset-form/form/model/data-offer-publish-mode.ts
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/form/model/datasource-type.ts b/src/app/shared/business/edit-asset-form/form/model/datasource-type.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form/form/model/datasource-type.ts
rename to src/app/shared/business/edit-asset-form/form/model/datasource-type.ts
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/form/model/edit-asset-form-model.ts b/src/app/shared/business/edit-asset-form/form/model/edit-asset-form-model.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form/form/model/edit-asset-form-model.ts
rename to src/app/shared/business/edit-asset-form/form/model/edit-asset-form-model.ts
diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/http-datasource-auth-header-type.ts b/src/app/shared/business/edit-asset-form/form/model/http-datasource-auth-header-type.ts
similarity index 100%
rename from src/app/routes/connector-ui/asset-page/asset-edit-dialog/form/model/http-datasource-auth-header-type.ts
rename to src/app/shared/business/edit-asset-form/form/model/http-datasource-auth-header-type.ts
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/form/model/http-datasource-header-form-model.ts b/src/app/shared/business/edit-asset-form/form/model/http-datasource-header-form-model.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form/form/model/http-datasource-header-form-model.ts
rename to src/app/shared/business/edit-asset-form/form/model/http-datasource-header-form-model.ts
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/form/model/http-datasource-query-param-form-model.ts b/src/app/shared/business/edit-asset-form/form/model/http-datasource-query-param-form-model.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form/form/model/http-datasource-query-param-form-model.ts
rename to src/app/shared/business/edit-asset-form/form/model/http-datasource-query-param-form-model.ts
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form/form/model/temporal-coverage-form-model.ts b/src/app/shared/business/edit-asset-form/form/model/temporal-coverage-form-model.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form/form/model/temporal-coverage-form-model.ts
rename to src/app/shared/business/edit-asset-form/form/model/temporal-coverage-form-model.ts
diff --git a/src/app/component-library/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component.html b/src/app/shared/business/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component.html
similarity index 100%
rename from src/app/component-library/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component.html
rename to src/app/shared/business/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component.html
diff --git a/src/app/component-library/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component.scss b/src/app/shared/business/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component.scss
similarity index 100%
rename from src/app/component-library/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component.scss
rename to src/app/shared/business/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component.scss
diff --git a/src/app/component-library/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component.ts b/src/app/shared/business/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component.ts
similarity index 100%
rename from src/app/component-library/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component.ts
rename to src/app/shared/business/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component.ts
diff --git a/src/app/component-library/policy-editor/editor/expression-form-controls.ts b/src/app/shared/business/policy-editor/editor/expression-form-controls.ts
similarity index 98%
rename from src/app/component-library/policy-editor/editor/expression-form-controls.ts
rename to src/app/shared/business/policy-editor/editor/expression-form-controls.ts
index f980317f0..ffe5b2dce 100644
--- a/src/app/component-library/policy-editor/editor/expression-form-controls.ts
+++ b/src/app/shared/business/policy-editor/editor/expression-form-controls.ts
@@ -6,8 +6,8 @@ import {
 } from '@angular/forms';
 import {OperatorDto, UiPolicyLiteral} from '@sovity.de/edc-client';
 import {PolicyOperatorConfig} from '../model/policy-operators';
+import {TreeNode} from '../model/tree';
 import {ExpressionFormValue} from './expression-form-value';
-import {TreeNode} from './tree';
 
 /**
  * Manages the FormGroup across the expression tree
diff --git a/src/app/component-library/policy-editor/editor/expression-form-handler.ts b/src/app/shared/business/policy-editor/editor/expression-form-handler.ts
similarity index 91%
rename from src/app/component-library/policy-editor/editor/expression-form-handler.ts
rename to src/app/shared/business/policy-editor/editor/expression-form-handler.ts
index f44428cdb..cae3495c3 100644
--- a/src/app/component-library/policy-editor/editor/expression-form-handler.ts
+++ b/src/app/shared/business/policy-editor/editor/expression-form-handler.ts
@@ -3,11 +3,11 @@ import {UiPolicyExpression} from '@sovity.de/edc-client';
 import {PolicyExpressionMapped} from '../model/policy-expression-mapped';
 import {PolicyMapper} from '../model/policy-mapper';
 import {PolicyMultiExpressionConfig} from '../model/policy-multi-expressions';
-import {SUPPORTED_POLICY_OPERATORS} from '../model/policy-operators';
+import {PolicyOperatorService} from '../model/policy-operators';
 import {PolicyVerbConfig} from '../model/policy-verbs';
+import {Tree, TreeGeneratorFn, TreeNode} from '../model/tree';
 import {ExpressionFormControls} from './expression-form-controls';
 import {ExpressionFormValue} from './expression-form-value';
-import {Tree, TreeGeneratorFn, TreeNode} from './tree';
 
 /**
  * Central service for interacting with the policy expression form.
@@ -21,6 +21,7 @@ export class ExpressionFormHandler {
   constructor(
     public controls: ExpressionFormControls,
     public policyMapper: PolicyMapper,
+    private policyOperatorService: PolicyOperatorService,
   ) {}
 
   private buildTree(
@@ -107,9 +108,9 @@ export class ExpressionFormHandler {
   private buildExpressionFormValue(
     original: PolicyExpressionMapped,
   ): ExpressionFormValue {
-    const supportedOperators = SUPPORTED_POLICY_OPERATORS.filter((it) =>
-      original.verb?.supportedOperators.includes(it.id),
-    );
+    const supportedOperators = this.policyOperatorService
+      .getSupportedPolicyOperators()
+      .filter((it) => original.verb?.supportedOperators.includes(it.id));
     return {
       type: original.type,
       multiExpression: original.multiExpression,
diff --git a/src/app/component-library/policy-editor/editor/expression-form-value.ts b/src/app/shared/business/policy-editor/editor/expression-form-value.ts
similarity index 100%
rename from src/app/component-library/policy-editor/editor/expression-form-value.ts
rename to src/app/shared/business/policy-editor/editor/expression-form-value.ts
diff --git a/src/app/component-library/policy-editor/editor/policy-form-add-menu/policy-form-add-menu.component.html b/src/app/shared/business/policy-editor/editor/policy-form-add-menu/policy-form-add-menu.component.html
similarity index 88%
rename from src/app/component-library/policy-editor/editor/policy-form-add-menu/policy-form-add-menu.component.html
rename to src/app/shared/business/policy-editor/editor/policy-form-add-menu/policy-form-add-menu.component.html
index 56510ef12..dbc6158da 100644
--- a/src/app/component-library/policy-editor/editor/policy-form-add-menu/policy-form-add-menu.component.html
+++ b/src/app/shared/business/policy-editor/editor/policy-form-add-menu/policy-form-add-menu.component.html
@@ -1,9 +1,12 @@
-<button mat-icon-button [matMenuTriggerFor]="menu">
+<button
+  mat-icon-button
+  [matMenuTriggerFor]="menu"
+  (menuOpened)="onMenuOpened()">
   <mat-icon>add</mat-icon>
 </button>
 <mat-menu #menu="matMenu">
   <button
-    *ngFor="let constraint of constraints"
+    *ngFor="let constraint of verbs"
     mat-menu-item
     [matTooltip]="constraint.operandLeftDescription"
     (click)="onAddConstraint(constraint)">
diff --git a/src/app/component-library/policy-editor/editor/policy-form-add-menu/policy-form-add-menu.component.ts b/src/app/shared/business/policy-editor/editor/policy-form-add-menu/policy-form-add-menu.component.ts
similarity index 73%
rename from src/app/component-library/policy-editor/editor/policy-form-add-menu/policy-form-add-menu.component.ts
rename to src/app/shared/business/policy-editor/editor/policy-form-add-menu/policy-form-add-menu.component.ts
index 1307c27ec..ea0a9300a 100644
--- a/src/app/component-library/policy-editor/editor/policy-form-add-menu/policy-form-add-menu.component.ts
+++ b/src/app/shared/business/policy-editor/editor/policy-form-add-menu/policy-form-add-menu.component.ts
@@ -2,27 +2,24 @@ import {Component, Input, OnDestroy} from '@angular/core';
 import {Subject} from 'rxjs';
 import {
   PolicyMultiExpressionConfig,
-  SUPPORTED_MULTI_EXPRESSIONS,
+  PolicyMultiExpressionService,
 } from '../../model/policy-multi-expressions';
-import {
-  PolicyVerbConfig,
-  SUPPORTED_POLICY_VERBS,
-} from '../../model/policy-verbs';
+import {PolicyVerbConfig, PolicyVerbService} from '../../model/policy-verbs';
+import {TreeNode} from '../../model/tree';
 import {ExpressionFormHandler} from '../expression-form-handler';
 import {ExpressionFormValue} from '../expression-form-value';
 import {
   PolicyExpressionRecipe,
   PolicyExpressionRecipeService,
 } from '../recipes/policy-expression-recipe.service';
-import {TreeNode} from '../tree';
 
 @Component({
   selector: 'policy-form-add-menu',
   templateUrl: './policy-form-add-menu.component.html',
 })
 export class PolicyFormAddMenuComponent implements OnDestroy {
-  multiExpressions = SUPPORTED_MULTI_EXPRESSIONS;
-  constraints = SUPPORTED_POLICY_VERBS;
+  multiExpressions: PolicyMultiExpressionConfig[] = [];
+  verbs: PolicyVerbConfig[] = [];
 
   @Input()
   treeNode!: TreeNode<ExpressionFormValue>;
@@ -30,8 +27,16 @@ export class PolicyFormAddMenuComponent implements OnDestroy {
   constructor(
     public expressionFormHandler: ExpressionFormHandler,
     public policyExpressionRecipeService: PolicyExpressionRecipeService,
+    private policyVerbService: PolicyVerbService,
+    private policyMultiExpressionService: PolicyMultiExpressionService,
   ) {}
 
+  onMenuOpened() {
+    this.verbs = this.policyVerbService.getSupportedPolicyVerbs();
+    this.multiExpressions =
+      this.policyMultiExpressionService.getSupportedMultiExpressions();
+  }
+
   onAddConstraint(constraint: PolicyVerbConfig) {
     const path = this.treeNode.path;
     this.expressionFormHandler.addConstraint(path, constraint);
diff --git a/src/app/component-library/policy-editor/editor/policy-form-expression-constraint/policy-form-expression-constraint.component.html b/src/app/shared/business/policy-editor/editor/policy-form-expression-constraint/policy-form-expression-constraint.component.html
similarity index 100%
rename from src/app/component-library/policy-editor/editor/policy-form-expression-constraint/policy-form-expression-constraint.component.html
rename to src/app/shared/business/policy-editor/editor/policy-form-expression-constraint/policy-form-expression-constraint.component.html
diff --git a/src/app/component-library/policy-editor/editor/policy-form-expression-constraint/policy-form-expression-constraint.component.ts b/src/app/shared/business/policy-editor/editor/policy-form-expression-constraint/policy-form-expression-constraint.component.ts
similarity index 94%
rename from src/app/component-library/policy-editor/editor/policy-form-expression-constraint/policy-form-expression-constraint.component.ts
rename to src/app/shared/business/policy-editor/editor/policy-form-expression-constraint/policy-form-expression-constraint.component.ts
index c6c898570..4dfd97c37 100644
--- a/src/app/component-library/policy-editor/editor/policy-form-expression-constraint/policy-form-expression-constraint.component.ts
+++ b/src/app/shared/business/policy-editor/editor/policy-form-expression-constraint/policy-form-expression-constraint.component.ts
@@ -1,8 +1,8 @@
 import {Component, HostBinding, Input} from '@angular/core';
 import {PolicyVerbConfig} from '../../model/policy-verbs';
+import {TreeNode} from '../../model/tree';
 import {ExpressionFormHandler} from '../expression-form-handler';
 import {ExpressionFormValue} from '../expression-form-value';
-import {TreeNode} from '../tree';
 
 @Component({
   selector: 'policy-form-expression-constraint',
diff --git a/src/app/component-library/policy-editor/editor/policy-form-expression-empty/policy-form-expression-empty.component.html b/src/app/shared/business/policy-editor/editor/policy-form-expression-empty/policy-form-expression-empty.component.html
similarity index 100%
rename from src/app/component-library/policy-editor/editor/policy-form-expression-empty/policy-form-expression-empty.component.html
rename to src/app/shared/business/policy-editor/editor/policy-form-expression-empty/policy-form-expression-empty.component.html
diff --git a/src/app/component-library/policy-editor/editor/policy-form-expression-empty/policy-form-expression-empty.component.ts b/src/app/shared/business/policy-editor/editor/policy-form-expression-empty/policy-form-expression-empty.component.ts
similarity index 91%
rename from src/app/component-library/policy-editor/editor/policy-form-expression-empty/policy-form-expression-empty.component.ts
rename to src/app/shared/business/policy-editor/editor/policy-form-expression-empty/policy-form-expression-empty.component.ts
index 00bc5b0c1..23cdfca95 100644
--- a/src/app/component-library/policy-editor/editor/policy-form-expression-empty/policy-form-expression-empty.component.ts
+++ b/src/app/shared/business/policy-editor/editor/policy-form-expression-empty/policy-form-expression-empty.component.ts
@@ -1,6 +1,6 @@
 import {Component, HostBinding, Input} from '@angular/core';
+import {TreeNode} from '../../model/tree';
 import {ExpressionFormValue} from '../expression-form-value';
-import {TreeNode} from '../tree';
 
 @Component({
   selector: 'policy-form-expression-empty',
diff --git a/src/app/component-library/policy-editor/editor/policy-form-expression-multi/policy-form-expression-multi.component.html b/src/app/shared/business/policy-editor/editor/policy-form-expression-multi/policy-form-expression-multi.component.html
similarity index 100%
rename from src/app/component-library/policy-editor/editor/policy-form-expression-multi/policy-form-expression-multi.component.html
rename to src/app/shared/business/policy-editor/editor/policy-form-expression-multi/policy-form-expression-multi.component.html
diff --git a/src/app/component-library/policy-editor/editor/policy-form-expression-multi/policy-form-expression-multi.component.ts b/src/app/shared/business/policy-editor/editor/policy-form-expression-multi/policy-form-expression-multi.component.ts
similarity index 93%
rename from src/app/component-library/policy-editor/editor/policy-form-expression-multi/policy-form-expression-multi.component.ts
rename to src/app/shared/business/policy-editor/editor/policy-form-expression-multi/policy-form-expression-multi.component.ts
index 8217993df..579859c82 100644
--- a/src/app/component-library/policy-editor/editor/policy-form-expression-multi/policy-form-expression-multi.component.ts
+++ b/src/app/shared/business/policy-editor/editor/policy-form-expression-multi/policy-form-expression-multi.component.ts
@@ -1,6 +1,6 @@
 import {Component, HostBinding, Input, TrackByFunction} from '@angular/core';
+import {TreeNode} from '../../model/tree';
 import {ExpressionFormValue} from '../expression-form-value';
-import {TreeNode} from '../tree';
 
 @Component({
   selector: 'policy-form-expression-multi',
diff --git a/src/app/component-library/policy-editor/editor/policy-form-expression/policy-form-expression.component.html b/src/app/shared/business/policy-editor/editor/policy-form-expression/policy-form-expression.component.html
similarity index 100%
rename from src/app/component-library/policy-editor/editor/policy-form-expression/policy-form-expression.component.html
rename to src/app/shared/business/policy-editor/editor/policy-form-expression/policy-form-expression.component.html
diff --git a/src/app/component-library/policy-editor/editor/policy-form-expression/policy-form-expression.component.ts b/src/app/shared/business/policy-editor/editor/policy-form-expression/policy-form-expression.component.ts
similarity index 93%
rename from src/app/component-library/policy-editor/editor/policy-form-expression/policy-form-expression.component.ts
rename to src/app/shared/business/policy-editor/editor/policy-form-expression/policy-form-expression.component.ts
index c4a21a4e0..59d875887 100644
--- a/src/app/component-library/policy-editor/editor/policy-form-expression/policy-form-expression.component.ts
+++ b/src/app/shared/business/policy-editor/editor/policy-form-expression/policy-form-expression.component.ts
@@ -1,7 +1,7 @@
 import {Component, Input, TrackByFunction} from '@angular/core';
+import {TreeNode} from '../../model/tree';
 import {ExpressionFormHandler} from '../expression-form-handler';
 import {ExpressionFormValue} from '../expression-form-value';
-import {TreeNode} from '../tree';
 
 @Component({
   selector: 'policy-form-expression',
diff --git a/src/app/component-library/policy-editor/editor/policy-form-remove-button/policy-form-remove-button.component.html b/src/app/shared/business/policy-editor/editor/policy-form-remove-button/policy-form-remove-button.component.html
similarity index 100%
rename from src/app/component-library/policy-editor/editor/policy-form-remove-button/policy-form-remove-button.component.html
rename to src/app/shared/business/policy-editor/editor/policy-form-remove-button/policy-form-remove-button.component.html
diff --git a/src/app/component-library/policy-editor/editor/policy-form-remove-button/policy-form-remove-button.component.ts b/src/app/shared/business/policy-editor/editor/policy-form-remove-button/policy-form-remove-button.component.ts
similarity index 92%
rename from src/app/component-library/policy-editor/editor/policy-form-remove-button/policy-form-remove-button.component.ts
rename to src/app/shared/business/policy-editor/editor/policy-form-remove-button/policy-form-remove-button.component.ts
index e3469a02a..33e5a6025 100644
--- a/src/app/component-library/policy-editor/editor/policy-form-remove-button/policy-form-remove-button.component.ts
+++ b/src/app/shared/business/policy-editor/editor/policy-form-remove-button/policy-form-remove-button.component.ts
@@ -1,7 +1,7 @@
 import {Component, Input} from '@angular/core';
+import {TreeNode} from '../../model/tree';
 import {ExpressionFormHandler} from '../expression-form-handler';
 import {ExpressionFormValue} from '../expression-form-value';
-import {TreeNode} from '../tree';
 
 @Component({
   selector: 'policy-form-remove-button',
diff --git a/src/app/shared/business/policy-editor/editor/policy-form-required-providers.ts b/src/app/shared/business/policy-editor/editor/policy-form-required-providers.ts
new file mode 100644
index 000000000..2047b3756
--- /dev/null
+++ b/src/app/shared/business/policy-editor/editor/policy-form-required-providers.ts
@@ -0,0 +1,7 @@
+import {ExpressionFormControls} from './expression-form-controls';
+import {ExpressionFormHandler} from './expression-form-handler';
+
+export const policyFormRequiredViewProviders = [
+  ExpressionFormHandler,
+  ExpressionFormControls,
+];
diff --git a/src/app/component-library/policy-editor/editor/recipes/policy-expression-recipe.service.ts b/src/app/shared/business/policy-editor/editor/recipes/policy-expression-recipe.service.ts
similarity index 89%
rename from src/app/component-library/policy-editor/editor/recipes/policy-expression-recipe.service.ts
rename to src/app/shared/business/policy-editor/editor/recipes/policy-expression-recipe.service.ts
index 6f2ccaf97..c94ef7891 100644
--- a/src/app/component-library/policy-editor/editor/recipes/policy-expression-recipe.service.ts
+++ b/src/app/shared/business/policy-editor/editor/recipes/policy-expression-recipe.service.ts
@@ -3,8 +3,8 @@ import {Injectable} from '@angular/core';
 import {MatDialog} from '@angular/material/dialog';
 import {Observable} from 'rxjs';
 import {UiPolicyExpression} from '@sovity.de/edc-client';
-import {showDialogUntil} from '../../../../core/utils/mat-dialog-utils';
-import {filterNotNull} from '../../../../core/utils/rxjs-utils';
+import {showDialogUntil} from '../../../../../core/utils/mat-dialog-utils';
+import {filterNotNull} from '../../../../../core/utils/rxjs-utils';
 import {TimespanRestrictionDialogComponent} from './timespan-restriction-dialog/timespan-restriction-dialog.component';
 
 export interface PolicyExpressionRecipe {
diff --git a/src/app/component-library/policy-editor/editor/recipes/timespan-restriction-dialog/timespan-restriction-dialog.component.html b/src/app/shared/business/policy-editor/editor/recipes/timespan-restriction-dialog/timespan-restriction-dialog.component.html
similarity index 100%
rename from src/app/component-library/policy-editor/editor/recipes/timespan-restriction-dialog/timespan-restriction-dialog.component.html
rename to src/app/shared/business/policy-editor/editor/recipes/timespan-restriction-dialog/timespan-restriction-dialog.component.html
diff --git a/src/app/component-library/policy-editor/editor/recipes/timespan-restriction-dialog/timespan-restriction-dialog.component.ts b/src/app/shared/business/policy-editor/editor/recipes/timespan-restriction-dialog/timespan-restriction-dialog.component.ts
similarity index 87%
rename from src/app/component-library/policy-editor/editor/recipes/timespan-restriction-dialog/timespan-restriction-dialog.component.ts
rename to src/app/shared/business/policy-editor/editor/recipes/timespan-restriction-dialog/timespan-restriction-dialog.component.ts
index 10363c6c5..2a163d9e9 100644
--- a/src/app/component-library/policy-editor/editor/recipes/timespan-restriction-dialog/timespan-restriction-dialog.component.ts
+++ b/src/app/shared/business/policy-editor/editor/recipes/timespan-restriction-dialog/timespan-restriction-dialog.component.ts
@@ -3,8 +3,8 @@ import {FormBuilder} from '@angular/forms';
 import {MatDialogRef} from '@angular/material/dialog';
 import {Subject} from 'rxjs';
 import {UiPolicyExpression} from '@sovity.de/edc-client';
-import {validDateRange} from '../../../../../core/validators/valid-date-range-optional-end';
-import {ValidationMessages} from '../../../../../core/validators/validation-messages';
+import {validDateRange} from '../../../../../../core/validators/valid-date-range-optional-end';
+import {ValidationMessages} from '../../../../../../core/validators/validation-messages';
 import {buildTimespanRestriction} from './timespan-restriction-expression';
 
 @Component({
diff --git a/src/app/component-library/policy-editor/editor/recipes/timespan-restriction-dialog/timespan-restriction-expression.ts b/src/app/shared/business/policy-editor/editor/recipes/timespan-restriction-dialog/timespan-restriction-expression.ts
similarity index 100%
rename from src/app/component-library/policy-editor/editor/recipes/timespan-restriction-dialog/timespan-restriction-expression.ts
rename to src/app/shared/business/policy-editor/editor/recipes/timespan-restriction-dialog/timespan-restriction-expression.ts
diff --git a/src/app/component-library/policy-editor/model/policy-expression-mapped.ts b/src/app/shared/business/policy-editor/model/policy-expression-mapped.ts
similarity index 100%
rename from src/app/component-library/policy-editor/model/policy-expression-mapped.ts
rename to src/app/shared/business/policy-editor/model/policy-expression-mapped.ts
diff --git a/src/app/component-library/policy-editor/model/policy-form-adapter.ts b/src/app/shared/business/policy-editor/model/policy-form-adapter.ts
similarity index 74%
rename from src/app/component-library/policy-editor/model/policy-form-adapter.ts
rename to src/app/shared/business/policy-editor/model/policy-form-adapter.ts
index d9fc0383e..2733949df 100644
--- a/src/app/component-library/policy-editor/model/policy-form-adapter.ts
+++ b/src/app/shared/business/policy-editor/model/policy-form-adapter.ts
@@ -1,8 +1,13 @@
 import {UntypedFormControl, Validators} from '@angular/forms';
 import {UiPolicyConstraint, UiPolicyLiteral} from '@sovity.de/edc-client';
 import {format} from 'date-fns-tz';
-import {filterNonNull} from '../../../core/utils/array-utils';
-import {jsonValidator} from '../../../core/validators/json-validator';
+import {jsonValidator} from '../../../../core/validators/json-validator';
+import {
+  readArrayLiteral,
+  readJsonLiteral,
+  readSingleStringLiteral,
+  stringLiteral,
+} from './policy-jsonld-utils';
 import {PolicyOperatorConfig} from './policy-operators';
 
 export interface PolicyFormAdapter<T> {
@@ -16,38 +21,6 @@ export interface PolicyFormAdapter<T> {
   emptyConstraintValue: () => Pick<UiPolicyConstraint, 'right' | 'operator'>;
 }
 
-const readSingleStringLiteral = (literal: UiPolicyLiteral): string | null => {
-  if (literal.type === 'STRING') {
-    return literal.value ?? null;
-  } else if (literal.type === 'STRING_LIST') {
-    return literal.valueList?.length ? literal.valueList[0] : null;
-  }
-  return null;
-};
-
-const readArrayLiteral = (literal: UiPolicyLiteral): string[] => {
-  if (literal.type === 'STRING') {
-    return filterNonNull([literal.value]);
-  } else if (literal.type === 'STRING_LIST') {
-    return literal.valueList ?? [];
-  }
-  return [];
-};
-
-const readJsonLiteral = (literal: UiPolicyLiteral): string => {
-  if (literal.type === 'STRING') {
-    return JSON.stringify(literal.value);
-  } else if (literal.type === 'STRING_LIST') {
-    return JSON.stringify(literal.valueList);
-  }
-  return literal.value ?? 'null';
-};
-
-const stringLiteral = (value: string | null | undefined): UiPolicyLiteral => ({
-  type: 'STRING',
-  value: value ?? undefined,
-});
-
 export const localDateAdapter: PolicyFormAdapter<Date | null> = {
   displayText: (literal): string | null => {
     const value = readSingleStringLiteral(literal);
diff --git a/src/app/shared/business/policy-editor/model/policy-jsonld-utils.ts b/src/app/shared/business/policy-editor/model/policy-jsonld-utils.ts
new file mode 100644
index 000000000..c4502862b
--- /dev/null
+++ b/src/app/shared/business/policy-editor/model/policy-jsonld-utils.ts
@@ -0,0 +1,38 @@
+import {UiPolicyLiteral} from '@sovity.de/edc-client';
+import {filterNonNull} from '../../../../core/utils/array-utils';
+
+export const readSingleStringLiteral = (
+  literal: UiPolicyLiteral,
+): string | null => {
+  if (literal.type === 'STRING') {
+    return literal.value ?? null;
+  } else if (literal.type === 'STRING_LIST') {
+    return literal.valueList?.length ? literal.valueList[0] : null;
+  }
+  return null;
+};
+
+export const readArrayLiteral = (literal: UiPolicyLiteral): string[] => {
+  if (literal.type === 'STRING') {
+    return filterNonNull([literal.value]);
+  } else if (literal.type === 'STRING_LIST') {
+    return literal.valueList ?? [];
+  }
+  return [];
+};
+
+export const readJsonLiteral = (literal: UiPolicyLiteral): string => {
+  if (literal.type === 'STRING') {
+    return JSON.stringify(literal.value);
+  } else if (literal.type === 'STRING_LIST') {
+    return JSON.stringify(literal.valueList);
+  }
+  return literal.value ?? 'null';
+};
+
+export const stringLiteral = (
+  value: string | null | undefined,
+): UiPolicyLiteral => ({
+  type: 'STRING',
+  value: value ?? undefined,
+});
diff --git a/src/app/component-library/policy-editor/model/policy-left-expressions.ts b/src/app/shared/business/policy-editor/model/policy-left-expressions.ts
similarity index 100%
rename from src/app/component-library/policy-editor/model/policy-left-expressions.ts
rename to src/app/shared/business/policy-editor/model/policy-left-expressions.ts
diff --git a/src/app/shared/business/policy-editor/model/policy-mapper.ts b/src/app/shared/business/policy-editor/model/policy-mapper.ts
new file mode 100644
index 000000000..7875805d9
--- /dev/null
+++ b/src/app/shared/business/policy-editor/model/policy-mapper.ts
@@ -0,0 +1,88 @@
+import {Injectable} from '@angular/core';
+import {UiPolicyExpression, UiPolicyLiteral} from '@sovity.de/edc-client';
+import {PolicyExpressionMapped} from './policy-expression-mapped';
+import {PolicyMultiExpressionService} from './policy-multi-expressions';
+import {PolicyOperatorService} from './policy-operators';
+import {PolicyVerbConfig, PolicyVerbService} from './policy-verbs';
+
+@Injectable()
+export class PolicyMapper {
+  constructor(
+    private policyOperatorService: PolicyOperatorService,
+    private policyMultiExpressionService: PolicyMultiExpressionService,
+    private policyVerbService: PolicyVerbService,
+  ) {}
+
+  buildPolicy(expression: UiPolicyExpression): PolicyExpressionMapped {
+    if (expression.type === 'EMPTY') {
+      return {type: 'EMPTY'};
+    }
+
+    if (expression.type === 'CONSTRAINT') {
+      return this.mapConstraint(expression);
+    }
+
+    return this.mapMultiExpression(expression);
+  }
+
+  private mapConstraint(
+    expression: UiPolicyExpression,
+  ): PolicyExpressionMapped {
+    const verb = this.policyVerbService.getVerbConfig(
+      expression.constraint?.left!,
+    );
+    const operator = this.policyOperatorService.getOperatorConfig(
+      expression.constraint?.operator!,
+    );
+    const value = expression.constraint?.right;
+
+    return {
+      type: 'CONSTRAINT',
+      verb,
+      operator,
+      valueRaw: value,
+      valueJson: this.formatJson(value!),
+      displayValue: this.formatValue(value, verb) ?? 'null',
+    };
+  }
+
+  private mapMultiExpression(
+    expression: UiPolicyExpression,
+  ): PolicyExpressionMapped {
+    const multiExpression =
+      this.policyMultiExpressionService.getMultiExpressionConfig(
+        expression.type,
+      );
+    const expressions = (expression.expressions ?? []).map((it) =>
+      this.buildPolicy(it),
+    );
+    return {
+      type: 'MULTI',
+      multiExpression,
+      expressions,
+    };
+  }
+
+  private formatValue(
+    value: UiPolicyLiteral | undefined,
+    verbConfig: PolicyVerbConfig,
+  ) {
+    if (value == null) {
+      return '';
+    }
+
+    return verbConfig.adapter.displayText(value);
+  }
+
+  private formatJson(value: UiPolicyLiteral): string {
+    if (value.type === 'STRING_LIST') {
+      return JSON.stringify(value.valueList);
+    }
+
+    if (value.type === 'JSON') {
+      return value.value ?? '';
+    }
+
+    return JSON.stringify(value.value);
+  }
+}
diff --git a/src/app/shared/business/policy-editor/model/policy-multi-expressions.ts b/src/app/shared/business/policy-editor/model/policy-multi-expressions.ts
new file mode 100644
index 000000000..afa9aa22b
--- /dev/null
+++ b/src/app/shared/business/policy-editor/model/policy-multi-expressions.ts
@@ -0,0 +1,76 @@
+import {Injectable} from '@angular/core';
+import {TranslateService} from '@ngx-translate/core';
+import {UiPolicyExpressionType} from '@sovity.de/edc-client';
+import {LazyTranslation} from '../../../../core/utils/lazy-utils';
+import {associateBy} from '../../../../core/utils/map-utils';
+
+export interface PolicyMultiExpressionConfig {
+  expressionType: UiPolicyExpressionType;
+  title: string;
+  description: string;
+}
+
+@Injectable()
+export class PolicyMultiExpressionService {
+  byId: LazyTranslation<
+    Map<UiPolicyExpressionType, PolicyMultiExpressionConfig>
+  >;
+
+  constructor(private translateService: TranslateService) {
+    this.byId = new LazyTranslation(this.translateService, () =>
+      this.buildByIdMap(),
+    );
+  }
+
+  getMultiExpressionConfig(
+    expressionType: UiPolicyExpressionType,
+  ): PolicyMultiExpressionConfig {
+    return (
+      this.byId.getValue().get(expressionType) ??
+      this.getFallbackMultiExpressionConfig(expressionType)
+    );
+  }
+
+  getSupportedMultiExpressions(): PolicyMultiExpressionConfig[] {
+    return [
+      {
+        expressionType: 'AND',
+        title: 'AND',
+        description:
+          'Conjunction of several expressions. Evaluates to true if and only if all child expressions are true',
+      },
+      {
+        expressionType: 'OR',
+        title: 'OR',
+        description:
+          'Disjunction of several expressions. Evaluates to true if and only if at least one child expression is true',
+      },
+      {
+        expressionType: 'XONE',
+        title: 'XONE',
+        description:
+          'XONE operation. Evaluates to true if and only if exactly one child expression is true',
+      },
+    ];
+  }
+
+  private buildByIdMap(): Map<
+    UiPolicyExpressionType,
+    PolicyMultiExpressionConfig
+  > {
+    return associateBy(
+      this.getSupportedMultiExpressions(),
+      (it) => it.expressionType,
+    );
+  }
+
+  private getFallbackMultiExpressionConfig(
+    expressionType: UiPolicyExpressionType,
+  ) {
+    return {
+      expressionType,
+      title: expressionType,
+      description: '',
+    };
+  }
+}
diff --git a/src/app/shared/business/policy-editor/model/policy-operators.ts b/src/app/shared/business/policy-editor/model/policy-operators.ts
new file mode 100644
index 000000000..e9722fcc1
--- /dev/null
+++ b/src/app/shared/business/policy-editor/model/policy-operators.ts
@@ -0,0 +1,108 @@
+import {Injectable} from '@angular/core';
+import {TranslateService} from '@ngx-translate/core';
+import {OperatorDto} from '@sovity.de/edc-client';
+import {LazyTranslation} from '../../../../core/utils/lazy-utils';
+import {associateBy} from '../../../../core/utils/map-utils';
+
+export interface PolicyOperatorConfig {
+  id: OperatorDto;
+  title: string;
+  description: string;
+}
+
+@Injectable()
+export class PolicyOperatorService {
+  byId: LazyTranslation<Map<OperatorDto, PolicyOperatorConfig>>;
+
+  constructor(private translateService: TranslateService) {
+    this.byId = new LazyTranslation(this.translateService, () =>
+      this.buildByIdMap(),
+    );
+  }
+
+  getOperatorConfig(operator: OperatorDto): PolicyOperatorConfig {
+    return (
+      this.byId.getValue().get(operator) ??
+      this.defaultPolicyOperatorConfig(operator)
+    );
+  }
+
+  getSupportedPolicyOperators(): PolicyOperatorConfig[] {
+    return [
+      {
+        id: 'EQ',
+        title: '=',
+        description: 'Equal to',
+      },
+      {
+        id: 'NEQ',
+        title: '≠',
+        description: 'Not equal to',
+      },
+      {
+        id: 'GEQ',
+        title: '≥',
+        description: 'Greater than or equal to',
+      },
+      {
+        id: 'GT',
+        title: '>',
+        description: 'Greater than',
+      },
+      {
+        id: 'LEQ',
+        title: '≤',
+        description: 'Less than or equal to',
+      },
+      {
+        id: 'LT',
+        title: '<',
+        description: 'Less than',
+      },
+      {
+        id: 'IN',
+        title: 'IN',
+        description: 'In',
+      },
+      {
+        id: 'HAS_PART',
+        title: 'HAS PART',
+        description: 'Has Part',
+      },
+      {
+        id: 'IS_A',
+        title: 'IS A',
+        description: 'Is a',
+      },
+      {
+        id: 'IS_NONE_OF',
+        title: 'IS NONE OF',
+        description: 'Is none of',
+      },
+      {
+        id: 'IS_ANY_OF',
+        title: 'IS ANY OF',
+        description: 'Is any of',
+      },
+      {
+        id: 'IS_ALL_OF',
+        title: 'IS ALL OF',
+        description: 'Is all of',
+      },
+    ];
+  }
+
+  private buildByIdMap(): Map<OperatorDto, PolicyOperatorConfig> {
+    return associateBy(this.getSupportedPolicyOperators(), (it) => it.id);
+  }
+
+  private defaultPolicyOperatorConfig(
+    operator: OperatorDto,
+  ): PolicyOperatorConfig {
+    return {
+      id: operator,
+      title: operator,
+      description: '',
+    };
+  }
+}
diff --git a/src/app/shared/business/policy-editor/model/policy-verbs.ts b/src/app/shared/business/policy-editor/model/policy-verbs.ts
new file mode 100644
index 000000000..013ec73d1
--- /dev/null
+++ b/src/app/shared/business/policy-editor/model/policy-verbs.ts
@@ -0,0 +1,89 @@
+import {Injectable} from '@angular/core';
+import {TranslateService} from '@ngx-translate/core';
+import {OperatorDto} from '@sovity.de/edc-client';
+import {LazyTranslation} from '../../../../core/utils/lazy-utils';
+import {associateBy} from '../../../../core/utils/map-utils';
+import {
+  PolicyFormAdapter,
+  jsonAdapter,
+  localDateAdapter,
+  stringArrayOrCommaJoinedAdapter,
+} from './policy-form-adapter';
+import {policyLeftExpressions} from './policy-left-expressions';
+import {PolicyOperatorService} from './policy-operators';
+
+export interface PolicyVerbConfig {
+  operandLeftId: string;
+  operandLeftTitle: string;
+  operandLeftDescription: string;
+  operandRightType: 'DATE' | 'TEXT' | 'PARTICIPANT_ID';
+  operandRightHint?: string;
+  operandRightPlaceholder?: string;
+  supportedOperators: OperatorDto[];
+  adapter: PolicyFormAdapter<any>;
+}
+
+@Injectable()
+export class PolicyVerbService {
+  byId: LazyTranslation<Map<string, PolicyVerbConfig>>;
+
+  constructor(
+    private translateService: TranslateService,
+    private policyOperatorService: PolicyOperatorService,
+  ) {
+    this.byId = new LazyTranslation(this.translateService, () =>
+      this.buildByIdMap(),
+    );
+  }
+
+  getVerbConfig(verb: string): PolicyVerbConfig {
+    return this.byId.getValue().get(verb) ?? this.getFallbackVerbConfig(verb);
+  }
+
+  getFallbackVerbConfig(verb: string): PolicyVerbConfig {
+    return {
+      operandLeftId: verb,
+      operandLeftTitle: verb,
+      operandLeftDescription: '',
+      supportedOperators: this.policyOperatorService
+        .getSupportedPolicyOperators()
+        .map((it) => it.id),
+      operandRightType: 'TEXT',
+      adapter: jsonAdapter,
+    };
+  }
+
+  getSupportedPolicyVerbs(): PolicyVerbConfig[] {
+    return [
+      {
+        operandLeftId: policyLeftExpressions.referringConnector,
+        operandLeftTitle: "Consumer's Participant ID",
+        operandLeftDescription:
+          "Consumer's Participant ID, also called Connector ID, of the counter-party connector.",
+        operandRightType: 'PARTICIPANT_ID',
+        supportedOperators: ['EQ', 'IN'],
+        operandRightPlaceholder: 'MDSL1234XX.C1234YY',
+        operandRightHint: 'Multiple values can be joined by comma',
+        adapter: stringArrayOrCommaJoinedAdapter,
+      },
+      {
+        operandLeftId: policyLeftExpressions.policyEvaluationTime,
+        operandLeftTitle: 'Time Restriction',
+        operandLeftDescription:
+          'Time at which the policy is evaluated. This can be used to restrict the data offer to certain time periods',
+        supportedOperators: ['GEQ', 'LEQ', 'GT', 'LT'],
+        operandRightType: 'DATE',
+        operandRightPlaceholder: 'DD/MM/YYYY',
+        operandRightHint: 'DD/MM/YYYY',
+        adapter: localDateAdapter,
+      },
+    ];
+  }
+
+  private buildByIdMap(): Map<string, PolicyVerbConfig> {
+    return associateBy(
+      this.getSupportedPolicyVerbs(),
+      (it) => it.operandLeftId,
+    );
+  }
+}
diff --git a/src/app/component-library/policy-editor/editor/tree.ts b/src/app/shared/business/policy-editor/model/tree.ts
similarity index 100%
rename from src/app/component-library/policy-editor/editor/tree.ts
rename to src/app/shared/business/policy-editor/model/tree.ts
diff --git a/src/app/component-library/policy-editor/model/ui-policy-expression-utils.ts b/src/app/shared/business/policy-editor/model/ui-policy-expression-utils.ts
similarity index 100%
rename from src/app/component-library/policy-editor/model/ui-policy-expression-utils.ts
rename to src/app/shared/business/policy-editor/model/ui-policy-expression-utils.ts
diff --git a/src/app/component-library/policy-editor/renderer/policy-expression/policy-expression.component.html b/src/app/shared/business/policy-editor/renderer/policy-expression/policy-expression.component.html
similarity index 100%
rename from src/app/component-library/policy-editor/renderer/policy-expression/policy-expression.component.html
rename to src/app/shared/business/policy-editor/renderer/policy-expression/policy-expression.component.html
diff --git a/src/app/component-library/policy-editor/renderer/policy-expression/policy-expression.component.ts b/src/app/shared/business/policy-editor/renderer/policy-expression/policy-expression.component.ts
similarity index 100%
rename from src/app/component-library/policy-editor/renderer/policy-expression/policy-expression.component.ts
rename to src/app/shared/business/policy-editor/renderer/policy-expression/policy-expression.component.ts
diff --git a/src/app/component-library/policy-editor/renderer/policy-renderer/policy-renderer.component.html b/src/app/shared/business/policy-editor/renderer/policy-renderer/policy-renderer.component.html
similarity index 100%
rename from src/app/component-library/policy-editor/renderer/policy-renderer/policy-renderer.component.html
rename to src/app/shared/business/policy-editor/renderer/policy-renderer/policy-renderer.component.html
diff --git a/src/app/component-library/policy-editor/renderer/policy-renderer/policy-renderer.component.ts b/src/app/shared/business/policy-editor/renderer/policy-renderer/policy-renderer.component.ts
similarity index 100%
rename from src/app/component-library/policy-editor/renderer/policy-renderer/policy-renderer.component.ts
rename to src/app/shared/business/policy-editor/renderer/policy-renderer/policy-renderer.component.ts
diff --git a/src/app/component-library/catalog/transfer-history-mini-list/transfer-history-mini-list.component.html b/src/app/shared/business/transfer-history-mini-list/transfer-history-mini-list.component.html
similarity index 87%
rename from src/app/component-library/catalog/transfer-history-mini-list/transfer-history-mini-list.component.html
rename to src/app/shared/business/transfer-history-mini-list/transfer-history-mini-list.component.html
index cca53c2a8..c343688fe 100644
--- a/src/app/component-library/catalog/transfer-history-mini-list/transfer-history-mini-list.component.html
+++ b/src/app/shared/business/transfer-history-mini-list/transfer-history-mini-list.component.html
@@ -1,10 +1,3 @@
-<!--
-  ~ Copyright (c) 2021-2024. sovity GmbH
-  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
-  ~ Contributors:
-  ~    - Fraunhofer FIT: Internationalization and German Localization
-  -->
-
 <i *ngIf="!contractAgreement?.transferProcesses?.length">
   {{ 'component_library.no_transfer' | translate }}
 </i>
diff --git a/src/app/component-library/catalog/transfer-history-mini-list/transfer-history-mini-list.component.ts b/src/app/shared/business/transfer-history-mini-list/transfer-history-mini-list.component.ts
similarity index 100%
rename from src/app/component-library/catalog/transfer-history-mini-list/transfer-history-mini-list.component.ts
rename to src/app/shared/business/transfer-history-mini-list/transfer-history-mini-list.component.ts
diff --git a/src/app/component-library/ui-elements/ago/ago.component.ts b/src/app/shared/common/ago/ago.component.ts
similarity index 100%
rename from src/app/component-library/ui-elements/ago/ago.component.ts
rename to src/app/shared/common/ago/ago.component.ts
diff --git a/src/app/component-library/ui-elements/ago/ago.pipe.ts b/src/app/shared/common/ago/ago.pipe.ts
similarity index 76%
rename from src/app/component-library/ui-elements/ago/ago.pipe.ts
rename to src/app/shared/common/ago/ago.pipe.ts
index 2b21b223f..3b332b436 100644
--- a/src/app/component-library/ui-elements/ago/ago.pipe.ts
+++ b/src/app/shared/common/ago/ago.pipe.ts
@@ -1,9 +1,3 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
 import {Pipe, PipeTransform} from '@angular/core';
 import {Observable, concat, interval, of} from 'rxjs';
 import {distinctUntilChanged, map} from 'rxjs/operators';
diff --git a/src/app/component-library/ui-elements/ago/date-input.ts b/src/app/shared/common/ago/date-input.ts
similarity index 100%
rename from src/app/component-library/ui-elements/ago/date-input.ts
rename to src/app/shared/common/ago/date-input.ts
diff --git a/src/app/component-library/ui-elements/ago/formatDateAgo.ts b/src/app/shared/common/ago/formatDateAgo.ts
similarity index 71%
rename from src/app/component-library/ui-elements/ago/formatDateAgo.ts
rename to src/app/shared/common/ago/formatDateAgo.ts
index f46a54321..21f070eb1 100644
--- a/src/app/component-library/ui-elements/ago/formatDateAgo.ts
+++ b/src/app/shared/common/ago/formatDateAgo.ts
@@ -1,9 +1,3 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
 import {formatDistanceToNow} from 'date-fns';
 import {de, enUS} from 'date-fns/locale';
 import {DateInput} from './date-input';
diff --git a/src/app/component-library/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.html b/src/app/shared/common/confirmation-dialog/confirmation-dialog.component.html
similarity index 60%
rename from src/app/component-library/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.html
rename to src/app/shared/common/confirmation-dialog/confirmation-dialog.component.html
index 0b2191e30..890b080f6 100644
--- a/src/app/component-library/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.html
+++ b/src/app/shared/common/confirmation-dialog/confirmation-dialog.component.html
@@ -7,13 +7,10 @@ <h1 mat-dialog-title>
 </div>
 
 <div class="w-full flex flex-row justify-end" mat-dialog-actions>
-  <button mat-button color="{{ data.cancelColor }}" (click)="onCancel()">
+  <button mat-button [color]="data.cancelColor" (click)="onCancel()">
     {{ data.cancelText }}
   </button>
-  <button
-    mat-raised-button
-    color="{{ data.confirmColor }}"
-    (click)="onConfirm()">
+  <button mat-raised-button [color]="data.confirmColor" (click)="onConfirm()">
     {{ data.confirmText }}
   </button>
 </div>
diff --git a/src/app/component-library/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.scss b/src/app/shared/common/confirmation-dialog/confirmation-dialog.component.scss
similarity index 100%
rename from src/app/component-library/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.scss
rename to src/app/shared/common/confirmation-dialog/confirmation-dialog.component.scss
diff --git a/src/app/component-library/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.ts b/src/app/shared/common/confirmation-dialog/confirmation-dialog.component.ts
similarity index 86%
rename from src/app/component-library/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.ts
rename to src/app/shared/common/confirmation-dialog/confirmation-dialog.component.ts
index bc9d573b3..7f97381e9 100644
--- a/src/app/component-library/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.ts
+++ b/src/app/shared/common/confirmation-dialog/confirmation-dialog.component.ts
@@ -1,9 +1,3 @@
-/*
- * Copyright (c) 2021-2024. sovity GmbH
- * Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
- * Contributors:
- *    - Fraunhofer FIT: Internationalization and German Localization
- */
 import {Component, Inject, OnInit} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 import {TranslateService} from '@ngx-translate/core';
@@ -79,11 +73,11 @@ export class ConfirmDialogModel {
       `${translateService.instant('component_library.delete_title')}`,
       `${translateService.instant(
         'component_library.delete_one',
-      )} ${type} ${identifier} ${translateService.instant(
+      )} ${type} ${identifier}. ${translateService.instant(
         'component_library.delete_two',
       )}`,
     );
-    dialogData.confirmColor = translateService.instant('general.warn');
+    dialogData.confirmColor = 'warn';
     dialogData.confirmText = translateService.instant('general.delete');
     dialogData.cancelText = translateService.instant('general.close');
     return dialogData;
diff --git a/src/app/component-library/ui-elements/date/date.component.ts b/src/app/shared/common/date/date.component.ts
similarity index 100%
rename from src/app/component-library/ui-elements/date/date.component.ts
rename to src/app/shared/common/date/date.component.ts
diff --git a/src/app/component-library/ui-elements/empty-state/empty-state.component.html b/src/app/shared/common/empty-state/empty-state.component.html
similarity index 100%
rename from src/app/component-library/ui-elements/empty-state/empty-state.component.html
rename to src/app/shared/common/empty-state/empty-state.component.html
diff --git a/src/app/component-library/ui-elements/empty-state/empty-state.component.ts b/src/app/shared/common/empty-state/empty-state.component.ts
similarity index 100%
rename from src/app/component-library/ui-elements/empty-state/empty-state.component.ts
rename to src/app/shared/common/empty-state/empty-state.component.ts
diff --git a/src/app/component-library/ui-elements/error-state/error-state.component.html b/src/app/shared/common/error-state/error-state.component.html
similarity index 100%
rename from src/app/component-library/ui-elements/error-state/error-state.component.html
rename to src/app/shared/common/error-state/error-state.component.html
diff --git a/src/app/component-library/ui-elements/error-state/error-state.component.ts b/src/app/shared/common/error-state/error-state.component.ts
similarity index 100%
rename from src/app/component-library/ui-elements/error-state/error-state.component.ts
rename to src/app/shared/common/error-state/error-state.component.ts
diff --git a/src/app/component-library/ui-elements/horizontal-section-divider/horizontal-section-divider.component.html b/src/app/shared/common/horizontal-section-divider/horizontal-section-divider.component.html
similarity index 100%
rename from src/app/component-library/ui-elements/horizontal-section-divider/horizontal-section-divider.component.html
rename to src/app/shared/common/horizontal-section-divider/horizontal-section-divider.component.html
diff --git a/src/app/component-library/ui-elements/horizontal-section-divider/horizontal-section-divider.component.ts b/src/app/shared/common/horizontal-section-divider/horizontal-section-divider.component.ts
similarity index 100%
rename from src/app/component-library/ui-elements/horizontal-section-divider/horizontal-section-divider.component.ts
rename to src/app/shared/common/horizontal-section-divider/horizontal-section-divider.component.ts
diff --git a/src/app/component-library/json-dialog/json-dialog/clean-json.ts b/src/app/shared/common/json-dialog/clean-json.ts
similarity index 100%
rename from src/app/component-library/json-dialog/json-dialog/clean-json.ts
rename to src/app/shared/common/json-dialog/clean-json.ts
diff --git a/src/app/component-library/json-dialog/json-dialog/json-dialog.component.html b/src/app/shared/common/json-dialog/json-dialog.component.html
similarity index 90%
rename from src/app/component-library/json-dialog/json-dialog/json-dialog.component.html
rename to src/app/shared/common/json-dialog/json-dialog.component.html
index 1cf0580c0..d951c326d 100644
--- a/src/app/component-library/json-dialog/json-dialog/json-dialog.component.html
+++ b/src/app/shared/common/json-dialog/json-dialog.component.html
@@ -42,8 +42,8 @@
     <mat-checkbox
       class="example-margin"
       [(ngModel)]="removeNulls"
-      (ngModelChange)="updateVisibleJson()"
-      >Cleaned JSON
+      (ngModelChange)="updateVisibleJson()">
+      {{ 'component_library.json' | translate }}
     </mat-checkbox>
   </div>
   <div class="flex flex-row">
@@ -52,7 +52,7 @@
       color="default"
       [mat-dialog-close]="null"
       [disabled]="busy">
-      Close
+      {{ 'general.close' | translate }}
     </button>
   </div>
 </div>
diff --git a/src/app/component-library/json-dialog/json-dialog/json-dialog.component.ts b/src/app/shared/common/json-dialog/json-dialog.component.ts
similarity index 94%
rename from src/app/component-library/json-dialog/json-dialog/json-dialog.component.ts
rename to src/app/shared/common/json-dialog/json-dialog.component.ts
index edb4b7646..fa37b260c 100644
--- a/src/app/component-library/json-dialog/json-dialog/json-dialog.component.ts
+++ b/src/app/shared/common/json-dialog/json-dialog.component.ts
@@ -15,7 +15,7 @@ import {
 import {Subject} from 'rxjs';
 import {filter, finalize, takeUntil} from 'rxjs/operators';
 import {NgxJsonViewerComponent} from 'ngx-json-viewer';
-import {ConfirmationDialogComponent} from '../../confirmation-dialog/confirmation-dialog/confirmation-dialog.component';
+import {ConfirmationDialogComponent} from '../confirmation-dialog/confirmation-dialog.component';
 import {cleanJson} from './clean-json';
 import {DialogToolbarButton, JsonDialogData} from './json-dialog.data';
 
diff --git a/src/app/component-library/json-dialog/json-dialog/json-dialog.data.ts b/src/app/shared/common/json-dialog/json-dialog.data.ts
similarity index 75%
rename from src/app/component-library/json-dialog/json-dialog/json-dialog.data.ts
rename to src/app/shared/common/json-dialog/json-dialog.data.ts
index b9e1f8df6..00f5abe87 100644
--- a/src/app/component-library/json-dialog/json-dialog/json-dialog.data.ts
+++ b/src/app/shared/common/json-dialog/json-dialog.data.ts
@@ -1,5 +1,5 @@
 import {Observable} from 'rxjs';
-import {ConfirmDialogModel} from '../../confirmation-dialog/confirmation-dialog/confirmation-dialog.component';
+import {ConfirmDialogModel} from '../confirmation-dialog/confirmation-dialog.component';
 
 export interface JsonDialogData {
   title: string;
diff --git a/src/app/component-library/json-dialog/json-dialog/json-dialog.service.ts b/src/app/shared/common/json-dialog/json-dialog.service.ts
similarity index 100%
rename from src/app/component-library/json-dialog/json-dialog/json-dialog.service.ts
rename to src/app/shared/common/json-dialog/json-dialog.service.ts
diff --git a/src/app/shared/common/language-selector/language-selector.component.html b/src/app/shared/common/language-selector/language-selector.component.html
new file mode 100644
index 000000000..9137fcba1
--- /dev/null
+++ b/src/app/shared/common/language-selector/language-selector.component.html
@@ -0,0 +1,25 @@
+<button mat-icon-button [matMenuTriggerFor]="menu">
+  <mat-icon>
+    <img
+      *ngIf="selectedLanguage.value"
+      class="h-[1em]"
+      src="../../../../assets/images/flags/{{ selectedLanguage.value }}.svg"
+      alt="Selected Flag" />
+  </mat-icon>
+</button>
+
+<mat-menu #menu="matMenu">
+  <button
+    *ngFor="let language of supportedLanguages"
+    class="flex items-center"
+    mat-menu-item
+    [value]="language.code"
+    (click)="setSelectedLanguage(language)">
+    <mat-icon>
+      <img
+        class="h-[1em]"
+        src="../../../../assets/images/flags/{{ language.code }}.svg" />
+    </mat-icon>
+    <span>{{ language.name }}</span>
+  </button>
+</mat-menu>
diff --git a/src/app/shared/common/language-selector/language-selector.component.ts b/src/app/shared/common/language-selector/language-selector.component.ts
new file mode 100644
index 000000000..fbb697713
--- /dev/null
+++ b/src/app/shared/common/language-selector/language-selector.component.ts
@@ -0,0 +1,41 @@
+import {Component, OnInit} from '@angular/core';
+import {TranslateService} from '@ngx-translate/core';
+import {LocalStoredValue} from '../../../core/utils/local-stored-value';
+
+interface AvailableLanguage {
+  code: string;
+  name: string;
+}
+
+@Component({
+  selector: 'app-language-selector',
+  templateUrl: './language-selector.component.html',
+})
+export class LanguageSelectorComponent implements OnInit {
+  supportedLanguages: AvailableLanguage[] = [
+    {code: 'en', name: 'English'},
+    {code: 'de', name: 'Deutsch'},
+  ];
+
+  selectedLanguage = new LocalStoredValue<string>(
+    'en',
+    'selectedLanguage',
+    (value): value is string =>
+      this.supportedLanguages.map((it) => it.code).includes(value as string),
+  );
+
+  constructor(private translateService: TranslateService) {}
+
+  ngOnInit(): void {
+    this.updateSelectedLanguage();
+  }
+
+  setSelectedLanguage(language: AvailableLanguage) {
+    this.selectedLanguage.value = language.code;
+    this.updateSelectedLanguage();
+  }
+
+  updateSelectedLanguage() {
+    this.translateService.use(this.selectedLanguage.value);
+  }
+}
diff --git a/src/app/component-library/ui-elements/loading-state/loading-state.component.html b/src/app/shared/common/loading-state/loading-state.component.html
similarity index 100%
rename from src/app/component-library/ui-elements/loading-state/loading-state.component.html
rename to src/app/shared/common/loading-state/loading-state.component.html
diff --git a/src/app/component-library/ui-elements/loading-state/loading-state.component.ts b/src/app/shared/common/loading-state/loading-state.component.ts
similarity index 100%
rename from src/app/component-library/ui-elements/loading-state/loading-state.component.ts
rename to src/app/shared/common/loading-state/loading-state.component.ts
diff --git a/src/app/component-library/markdown-description/markdown-description.component.html b/src/app/shared/common/markdown-description/markdown-description.component.html
similarity index 78%
rename from src/app/component-library/markdown-description/markdown-description.component.html
rename to src/app/shared/common/markdown-description/markdown-description.component.html
index 7e2035708..a97a6d460 100644
--- a/src/app/component-library/markdown-description/markdown-description.component.html
+++ b/src/app/shared/common/markdown-description/markdown-description.component.html
@@ -1,10 +1,3 @@
-<!--
-  ~ Copyright (c) 2021-2024. sovity GmbH
-  ~ Copyright (c) 2024. Fraunhofer Institute for Applied Information Technology FIT
-  ~ Contributors:
-  ~    - Fraunhofer FIT: Internationalization and German Localization
-  -->
-
 <div
   class="overflow-hidden relative"
   [style.height.px]="isCollapsed ? collapsedDescriptionHeight : null">
@@ -15,7 +8,9 @@
       htmlSanitizer.sanitize(markdownConverter.toHtml(description ?? ''))
     "></div>
 
-  <i *ngIf="!description">('component_library.no_description' | translate)</i>
+  <i *ngIf="!description">{{
+    'component_library.no_description' | translate
+  }}</i>
 
   <div
     *ngIf="isCollapsed"
diff --git a/src/app/component-library/markdown-description/markdown-description.component.ts b/src/app/shared/common/markdown-description/markdown-description.component.ts
similarity index 96%
rename from src/app/component-library/markdown-description/markdown-description.component.ts
rename to src/app/shared/common/markdown-description/markdown-description.component.ts
index 28a6c6a34..052f1f962 100644
--- a/src/app/component-library/markdown-description/markdown-description.component.ts
+++ b/src/app/shared/common/markdown-description/markdown-description.component.ts
@@ -11,7 +11,7 @@ import {
 } from '@angular/core';
 import {HtmlSanitizer} from 'src/app/core/services/html-sanitizer';
 import {MarkdownConverter} from 'src/app/core/services/markdown-converter';
-import {SimpleChangesTyped} from '../../core/utils/angular-utils';
+import {SimpleChangesTyped} from '../../../core/utils/angular-utils';
 
 const COLLAPSED_DESCRIPTION_HEIGHT = 280;
 
diff --git a/src/app/component-library/property-grid/property-grid-group/property-grid-group.component.html b/src/app/shared/common/property-grid-group/property-grid-group.component.html
similarity index 89%
rename from src/app/component-library/property-grid/property-grid-group/property-grid-group.component.html
rename to src/app/shared/common/property-grid-group/property-grid-group.component.html
index 0daf72315..bbf69da23 100644
--- a/src/app/component-library/property-grid/property-grid-group/property-grid-group.component.html
+++ b/src/app/shared/common/property-grid-group/property-grid-group.component.html
@@ -6,7 +6,7 @@
   <div
     *ngIf="propGroup.groupLabel != null"
     class="flex flex-row flex-wrap property-grid-group-title"
-    style="{{ first ? 'margin-top: 20px;' : '' }}">
+    [style]="first ? 'margin-top: 20px;' : ''">
     {{ propGroup.groupLabel }}
   </div>
   <property-grid
diff --git a/src/app/component-library/property-grid/property-grid-group/property-grid-group.component.ts b/src/app/shared/common/property-grid-group/property-grid-group.component.ts
similarity index 100%
rename from src/app/component-library/property-grid/property-grid-group/property-grid-group.component.ts
rename to src/app/shared/common/property-grid-group/property-grid-group.component.ts
diff --git a/src/app/component-library/property-grid/property-grid-group/property-grid-group.ts b/src/app/shared/common/property-grid-group/property-grid-group.ts
similarity index 100%
rename from src/app/component-library/property-grid/property-grid-group/property-grid-group.ts
rename to src/app/shared/common/property-grid-group/property-grid-group.ts
diff --git a/src/app/component-library/property-grid/property-grid/property-grid-field.service.ts b/src/app/shared/common/property-grid/property-grid-field.service.ts
similarity index 100%
rename from src/app/component-library/property-grid/property-grid/property-grid-field.service.ts
rename to src/app/shared/common/property-grid/property-grid-field.service.ts
diff --git a/src/app/component-library/property-grid/property-grid/property-grid-field.ts b/src/app/shared/common/property-grid/property-grid-field.ts
similarity index 88%
rename from src/app/component-library/property-grid/property-grid/property-grid-field.ts
rename to src/app/shared/common/property-grid/property-grid-field.ts
index 96a992ea7..703024439 100644
--- a/src/app/component-library/property-grid/property-grid/property-grid-field.ts
+++ b/src/app/shared/common/property-grid/property-grid-field.ts
@@ -1,4 +1,4 @@
-import {PolicyExpressionMapped} from '../../policy-editor/model/policy-expression-mapped';
+import {PolicyExpressionMapped} from '../../business/policy-editor/model/policy-expression-mapped';
 
 export interface PropertyGridField {
   icon: string;
diff --git a/src/app/component-library/property-grid/property-grid/property-grid.component.html b/src/app/shared/common/property-grid/property-grid.component.html
similarity index 100%
rename from src/app/component-library/property-grid/property-grid/property-grid.component.html
rename to src/app/shared/common/property-grid/property-grid.component.html
diff --git a/src/app/component-library/property-grid/property-grid/property-grid.component.ts b/src/app/shared/common/property-grid/property-grid.component.ts
similarity index 100%
rename from src/app/component-library/property-grid/property-grid/property-grid.component.ts
rename to src/app/shared/common/property-grid/property-grid.component.ts
diff --git a/src/app/shared/common/translate-with-slot/translate-with-slot.component.html b/src/app/shared/common/translate-with-slot/translate-with-slot.component.html
new file mode 100644
index 000000000..a8dbf78c8
--- /dev/null
+++ b/src/app/shared/common/translate-with-slot/translate-with-slot.component.html
@@ -0,0 +1,3 @@
+<span>{{ textBefore }}</span>
+<ng-content *ngIf="hasMiddle"></ng-content>
+<span>{{ textAfter }}</span>
diff --git a/src/app/shared/common/translate-with-slot/translate-with-slot.component.ts b/src/app/shared/common/translate-with-slot/translate-with-slot.component.ts
new file mode 100644
index 000000000..ccc323a36
--- /dev/null
+++ b/src/app/shared/common/translate-with-slot/translate-with-slot.component.ts
@@ -0,0 +1,46 @@
+import {Component, Input, OnChanges, OnDestroy} from '@angular/core';
+import {Subject, switchMap} from 'rxjs';
+import {takeUntil} from 'rxjs/operators';
+import {TranslateService} from '@ngx-translate/core';
+import {SimpleChangesTyped} from '../../../core/utils/angular-utils';
+
+@Component({
+  selector: 'translate-with-slot',
+  templateUrl: './translate-with-slot.component.html',
+})
+export class TranslateWithSlotComponent implements OnChanges, OnDestroy {
+  @Input()
+  key!: string;
+  key$ = new Subject();
+
+  textBefore = '';
+  hasMiddle = false;
+  textAfter = '';
+
+  constructor(private translationService: TranslateService) {
+    this.key$
+      .pipe(
+        switchMap(() => this.translationService.get(this.key)),
+        takeUntil(this.ngOnDestroy$),
+      )
+      .subscribe((text) => {
+        const parts = text.split('{}');
+        this.textBefore = parts[0];
+        this.hasMiddle = parts.length > 1;
+        this.textAfter = parts[1] || '';
+      });
+  }
+
+  ngOnChanges(changes: SimpleChangesTyped<TranslateWithSlotComponent>) {
+    if (changes.key) {
+      this.key$.next(changes.key);
+    }
+  }
+
+  ngOnDestroy$ = new Subject();
+
+  ngOnDestroy() {
+    this.ngOnDestroy$.next(null);
+    this.ngOnDestroy$.complete();
+  }
+}
diff --git a/src/app/shared/common/truncated-short-description/truncated-short-description.component.html b/src/app/shared/common/truncated-short-description/truncated-short-description.component.html
new file mode 100644
index 000000000..ad639bb03
--- /dev/null
+++ b/src/app/shared/common/truncated-short-description/truncated-short-description.component.html
@@ -0,0 +1 @@
+{{ text || ('component_library.no_description' | translate) }}
diff --git a/src/app/component-library/catalog/truncated-short-description/truncated-short-description.component.ts b/src/app/shared/common/truncated-short-description/truncated-short-description.component.ts
similarity index 100%
rename from src/app/component-library/catalog/truncated-short-description/truncated-short-description.component.ts
rename to src/app/shared/common/truncated-short-description/truncated-short-description.component.ts
diff --git a/src/app/component-library/url-list-dialog/url-list-dialog/url-list-dialog.component.html b/src/app/shared/common/url-list-dialog/url-list-dialog.component.html
similarity index 84%
rename from src/app/component-library/url-list-dialog/url-list-dialog/url-list-dialog.component.html
rename to src/app/shared/common/url-list-dialog/url-list-dialog.component.html
index 50eb41aab..9b29e28cc 100644
--- a/src/app/component-library/url-list-dialog/url-list-dialog/url-list-dialog.component.html
+++ b/src/app/shared/common/url-list-dialog/url-list-dialog.component.html
@@ -18,7 +18,7 @@
   mat-dialog-content
   style="display: block; min-width: 40rem; max-width: 40rem; max-height: 60vh">
   <div *ngIf="data.description">
-    <div class="font-medium mb-2">Description</div>
+    <div class="font-medium mb-2">{{ 'general.description' | translate }}</div>
     <markdown-description
       [description]="data.description"></markdown-description>
   </div>
@@ -36,5 +36,7 @@
 </div>
 
 <div class="w-full justify-end flex flex-row" mat-dialog-actions>
-  <button mat-button color="default" [mat-dialog-close]="null">Close</button>
+  <button mat-button color="default" [mat-dialog-close]="null">
+    {{ 'general.close' | translate }}
+  </button>
 </div>
diff --git a/src/app/component-library/url-list-dialog/url-list-dialog/url-list-dialog.component.ts b/src/app/shared/common/url-list-dialog/url-list-dialog.component.ts
similarity index 100%
rename from src/app/component-library/url-list-dialog/url-list-dialog/url-list-dialog.component.ts
rename to src/app/shared/common/url-list-dialog/url-list-dialog.component.ts
diff --git a/src/app/component-library/url-list-dialog/url-list-dialog/url-list-dialog.data.ts b/src/app/shared/common/url-list-dialog/url-list-dialog.data.ts
similarity index 100%
rename from src/app/component-library/url-list-dialog/url-list-dialog/url-list-dialog.data.ts
rename to src/app/shared/common/url-list-dialog/url-list-dialog.data.ts
diff --git a/src/app/component-library/url-list-dialog/url-list-dialog/url-list-dialog.service.ts b/src/app/shared/common/url-list-dialog/url-list-dialog.service.ts
similarity index 100%
rename from src/app/component-library/url-list-dialog/url-list-dialog/url-list-dialog.service.ts
rename to src/app/shared/common/url-list-dialog/url-list-dialog.service.ts
diff --git a/src/app/component-library/data-address/data-address-type-select/data-address-type-select-item.ts b/src/app/shared/form-elements/data-address-type-select/data-address-type-select-item.ts
similarity index 100%
rename from src/app/component-library/data-address/data-address-type-select/data-address-type-select-item.ts
rename to src/app/shared/form-elements/data-address-type-select/data-address-type-select-item.ts
diff --git a/src/app/component-library/data-address/data-address-type-select/data-address-type-select-items.ts b/src/app/shared/form-elements/data-address-type-select/data-address-type-select-items.ts
similarity index 100%
rename from src/app/component-library/data-address/data-address-type-select/data-address-type-select-items.ts
rename to src/app/shared/form-elements/data-address-type-select/data-address-type-select-items.ts
diff --git a/src/app/component-library/data-address/data-address-type-select/data-address-type-select-mode.ts b/src/app/shared/form-elements/data-address-type-select/data-address-type-select-mode.ts
similarity index 100%
rename from src/app/component-library/data-address/data-address-type-select/data-address-type-select-mode.ts
rename to src/app/shared/form-elements/data-address-type-select/data-address-type-select-mode.ts
diff --git a/src/app/component-library/data-address/data-address-type-select/data-address-type-select.component.html b/src/app/shared/form-elements/data-address-type-select/data-address-type-select.component.html
similarity index 100%
rename from src/app/component-library/data-address/data-address-type-select/data-address-type-select.component.html
rename to src/app/shared/form-elements/data-address-type-select/data-address-type-select.component.html
diff --git a/src/app/component-library/data-address/data-address-type-select/data-address-type-select.component.ts b/src/app/shared/form-elements/data-address-type-select/data-address-type-select.component.ts
similarity index 100%
rename from src/app/component-library/data-address/data-address-type-select/data-address-type-select.component.ts
rename to src/app/shared/form-elements/data-address-type-select/data-address-type-select.component.ts
diff --git a/src/app/component-library/data-address/data-address-type-select/data-address-type.ts b/src/app/shared/form-elements/data-address-type-select/data-address-type.ts
similarity index 100%
rename from src/app/component-library/data-address/data-address-type-select/data-address-type.ts
rename to src/app/shared/form-elements/data-address-type-select/data-address-type.ts
diff --git a/src/app/component-library/edit-asset-form/data-category-select/data-category-select-data.ts b/src/app/shared/form-elements/data-category-select/data-category-select-data.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/data-category-select/data-category-select-data.ts
rename to src/app/shared/form-elements/data-category-select/data-category-select-data.ts
diff --git a/src/app/component-library/edit-asset-form/data-category-select/data-category-select-item.service.ts b/src/app/shared/form-elements/data-category-select/data-category-select-item.service.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/data-category-select/data-category-select-item.service.ts
rename to src/app/shared/form-elements/data-category-select/data-category-select-item.service.ts
diff --git a/src/app/component-library/edit-asset-form/data-category-select/data-category-select-item.ts b/src/app/shared/form-elements/data-category-select/data-category-select-item.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/data-category-select/data-category-select-item.ts
rename to src/app/shared/form-elements/data-category-select/data-category-select-item.ts
diff --git a/src/app/component-library/edit-asset-form/data-category-select/data-category-select.component.html b/src/app/shared/form-elements/data-category-select/data-category-select.component.html
similarity index 100%
rename from src/app/component-library/edit-asset-form/data-category-select/data-category-select.component.html
rename to src/app/shared/form-elements/data-category-select/data-category-select.component.html
diff --git a/src/app/component-library/edit-asset-form/data-category-select/data-category-select.component.ts b/src/app/shared/form-elements/data-category-select/data-category-select.component.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/data-category-select/data-category-select.component.ts
rename to src/app/shared/form-elements/data-category-select/data-category-select.component.ts
diff --git a/src/app/component-library/edit-asset-form/data-subcategory-select/data-subcategory-items.pipe.ts b/src/app/shared/form-elements/data-subcategory-select/data-subcategory-items.pipe.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/data-subcategory-select/data-subcategory-items.pipe.ts
rename to src/app/shared/form-elements/data-subcategory-select/data-subcategory-items.pipe.ts
diff --git a/src/app/component-library/edit-asset-form/data-subcategory-select/data-subcategory-select-data.ts b/src/app/shared/form-elements/data-subcategory-select/data-subcategory-select-data.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/data-subcategory-select/data-subcategory-select-data.ts
rename to src/app/shared/form-elements/data-subcategory-select/data-subcategory-select-data.ts
diff --git a/src/app/component-library/edit-asset-form/data-subcategory-select/data-subcategory-select-item.service.ts b/src/app/shared/form-elements/data-subcategory-select/data-subcategory-select-item.service.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/data-subcategory-select/data-subcategory-select-item.service.ts
rename to src/app/shared/form-elements/data-subcategory-select/data-subcategory-select-item.service.ts
diff --git a/src/app/component-library/edit-asset-form/data-subcategory-select/data-subcategory-select-item.ts b/src/app/shared/form-elements/data-subcategory-select/data-subcategory-select-item.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/data-subcategory-select/data-subcategory-select-item.ts
rename to src/app/shared/form-elements/data-subcategory-select/data-subcategory-select-item.ts
diff --git a/src/app/component-library/edit-asset-form/data-subcategory-select/data-subcategory-select.component.html b/src/app/shared/form-elements/data-subcategory-select/data-subcategory-select.component.html
similarity index 100%
rename from src/app/component-library/edit-asset-form/data-subcategory-select/data-subcategory-select.component.html
rename to src/app/shared/form-elements/data-subcategory-select/data-subcategory-select.component.html
diff --git a/src/app/component-library/edit-asset-form/data-subcategory-select/data-subcategory-select.component.ts b/src/app/shared/form-elements/data-subcategory-select/data-subcategory-select.component.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/data-subcategory-select/data-subcategory-select.component.ts
rename to src/app/shared/form-elements/data-subcategory-select/data-subcategory-select.component.ts
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form-data-address-type-select/edit-asset-form-data-address-type-select.component.html b/src/app/shared/form-elements/edit-asset-form-data-address-type-select/edit-asset-form-data-address-type-select.component.html
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form-data-address-type-select/edit-asset-form-data-address-type-select.component.html
rename to src/app/shared/form-elements/edit-asset-form-data-address-type-select/edit-asset-form-data-address-type-select.component.html
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form-data-address-type-select/edit-asset-form-data-address-type-select.component.ts b/src/app/shared/form-elements/edit-asset-form-data-address-type-select/edit-asset-form-data-address-type-select.component.ts
similarity index 85%
rename from src/app/component-library/edit-asset-form/edit-asset-form-data-address-type-select/edit-asset-form-data-address-type-select.component.ts
rename to src/app/shared/form-elements/edit-asset-form-data-address-type-select/edit-asset-form-data-address-type-select.component.ts
index dca3d6fea..68081dfcd 100644
--- a/src/app/component-library/edit-asset-form/edit-asset-form-data-address-type-select/edit-asset-form-data-address-type-select.component.ts
+++ b/src/app/shared/form-elements/edit-asset-form-data-address-type-select/edit-asset-form-data-address-type-select.component.ts
@@ -1,6 +1,6 @@
 import {Component, Input} from '@angular/core';
 import {FormControl} from '@angular/forms';
-import {DataAddressType} from '../../data-address/data-address-type-select/data-address-type';
+import {DataAddressType} from '../data-address-type-select/data-address-type';
 
 @Component({
   selector: 'edit-asset-form-data-address-type-select',
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form-group/edit-asset-form-group.component.html b/src/app/shared/form-elements/edit-asset-form-group/edit-asset-form-group.component.html
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form-group/edit-asset-form-group.component.html
rename to src/app/shared/form-elements/edit-asset-form-group/edit-asset-form-group.component.html
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form-group/edit-asset-form-group.component.ts b/src/app/shared/form-elements/edit-asset-form-group/edit-asset-form-group.component.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form-group/edit-asset-form-group.component.ts
rename to src/app/shared/form-elements/edit-asset-form-group/edit-asset-form-group.component.ts
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form-input/edit-asset-form-input.component.html b/src/app/shared/form-elements/edit-asset-form-input/edit-asset-form-input.component.html
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form-input/edit-asset-form-input.component.html
rename to src/app/shared/form-elements/edit-asset-form-input/edit-asset-form-input.component.html
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form-input/edit-asset-form-input.component.ts b/src/app/shared/form-elements/edit-asset-form-input/edit-asset-form-input.component.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form-input/edit-asset-form-input.component.ts
rename to src/app/shared/form-elements/edit-asset-form-input/edit-asset-form-input.component.ts
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form-label/edit-asset-form-label.component.html b/src/app/shared/form-elements/edit-asset-form-label/edit-asset-form-label.component.html
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form-label/edit-asset-form-label.component.html
rename to src/app/shared/form-elements/edit-asset-form-label/edit-asset-form-label.component.html
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form-label/edit-asset-form-label.component.ts b/src/app/shared/form-elements/edit-asset-form-label/edit-asset-form-label.component.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form-label/edit-asset-form-label.component.ts
rename to src/app/shared/form-elements/edit-asset-form-label/edit-asset-form-label.component.ts
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form-textarea/edit-asset-form-textarea.component.html b/src/app/shared/form-elements/edit-asset-form-textarea/edit-asset-form-textarea.component.html
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form-textarea/edit-asset-form-textarea.component.html
rename to src/app/shared/form-elements/edit-asset-form-textarea/edit-asset-form-textarea.component.html
diff --git a/src/app/component-library/edit-asset-form/edit-asset-form-textarea/edit-asset-form-textarea.component.ts b/src/app/shared/form-elements/edit-asset-form-textarea/edit-asset-form-textarea.component.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/edit-asset-form-textarea/edit-asset-form-textarea.component.ts
rename to src/app/shared/form-elements/edit-asset-form-textarea/edit-asset-form-textarea.component.ts
diff --git a/src/app/component-library/edit-asset-form/keyword-select/keyword-select.component.html b/src/app/shared/form-elements/keyword-select/keyword-select.component.html
similarity index 93%
rename from src/app/component-library/edit-asset-form/keyword-select/keyword-select.component.html
rename to src/app/shared/form-elements/keyword-select/keyword-select.component.html
index a8d83f6b4..e7bf8d321 100644
--- a/src/app/component-library/edit-asset-form/keyword-select/keyword-select.component.html
+++ b/src/app/shared/form-elements/keyword-select/keyword-select.component.html
@@ -17,7 +17,7 @@
     </mat-chip>
     <input
       id="create-asset-form-keywords"
-      placeholder="{{ 'asset_page.add_keyword' | translate }}"
+      [placeholder]="'asset_list_page.add_keyword' | translate"
       [matChipInputAddOnBlur]="true"
       [matChipInputFor]="chipList"
       [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
diff --git a/src/app/component-library/edit-asset-form/keyword-select/keyword-select.component.ts b/src/app/shared/form-elements/keyword-select/keyword-select.component.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/keyword-select/keyword-select.component.ts
rename to src/app/shared/form-elements/keyword-select/keyword-select.component.ts
diff --git a/src/app/component-library/edit-asset-form/language-select/language-select-data.ts b/src/app/shared/form-elements/language-select/language-select-data.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/language-select/language-select-data.ts
rename to src/app/shared/form-elements/language-select/language-select-data.ts
diff --git a/src/app/component-library/edit-asset-form/language-select/language-select-item.service.ts b/src/app/shared/form-elements/language-select/language-select-item.service.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/language-select/language-select-item.service.ts
rename to src/app/shared/form-elements/language-select/language-select-item.service.ts
diff --git a/src/app/component-library/edit-asset-form/language-select/language-select-item.ts b/src/app/shared/form-elements/language-select/language-select-item.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/language-select/language-select-item.ts
rename to src/app/shared/form-elements/language-select/language-select-item.ts
diff --git a/src/app/component-library/edit-asset-form/language-select/language-select.component.html b/src/app/shared/form-elements/language-select/language-select.component.html
similarity index 82%
rename from src/app/component-library/edit-asset-form/language-select/language-select.component.html
rename to src/app/shared/form-elements/language-select/language-select.component.html
index c86115460..fee39aa15 100644
--- a/src/app/component-library/edit-asset-form/language-select/language-select.component.html
+++ b/src/app/shared/form-elements/language-select/language-select.component.html
@@ -1,4 +1,6 @@
-<edit-asset-form-label [label]="label" [ctrl]="control"></edit-asset-form-label>
+<edit-asset-form-label
+  [label]="label ?? ('general.language' | translate)"
+  [ctrl]="control"></edit-asset-form-label>
 <mat-form-field class="w-full mt-1" color="accent">
   <mat-select [formControl]="control" [compareWith]="'id' | compareByField">
     <mat-option [value]="null">-</mat-option>
diff --git a/src/app/component-library/edit-asset-form/language-select/language-select.component.ts b/src/app/shared/form-elements/language-select/language-select.component.ts
similarity index 94%
rename from src/app/component-library/edit-asset-form/language-select/language-select.component.ts
rename to src/app/shared/form-elements/language-select/language-select.component.ts
index 0a48bfd9b..8d244a96d 100644
--- a/src/app/component-library/edit-asset-form/language-select/language-select.component.ts
+++ b/src/app/shared/form-elements/language-select/language-select.component.ts
@@ -9,7 +9,7 @@ import {LanguageSelectItemService} from './language-select-item.service';
 })
 export class LanguageSelectComponent {
   @Input()
-  label: string = 'Language';
+  label: string | null = null;
 
   @Input()
   control!: FormControl<LanguageSelectItem | null>;
diff --git a/src/app/component-library/policy-editor/editor/controls/participant-id-select/participant-id-select.component.html b/src/app/shared/form-elements/participant-id-select/participant-id-select.component.html
similarity index 100%
rename from src/app/component-library/policy-editor/editor/controls/participant-id-select/participant-id-select.component.html
rename to src/app/shared/form-elements/participant-id-select/participant-id-select.component.html
diff --git a/src/app/component-library/policy-editor/editor/controls/participant-id-select/participant-id-select.component.ts b/src/app/shared/form-elements/participant-id-select/participant-id-select.component.ts
similarity index 86%
rename from src/app/component-library/policy-editor/editor/controls/participant-id-select/participant-id-select.component.ts
rename to src/app/shared/form-elements/participant-id-select/participant-id-select.component.ts
index e7c703d7b..931c06645 100644
--- a/src/app/component-library/policy-editor/editor/controls/participant-id-select/participant-id-select.component.ts
+++ b/src/app/shared/form-elements/participant-id-select/participant-id-select.component.ts
@@ -2,8 +2,8 @@ import {COMMA, ENTER, SEMICOLON} from '@angular/cdk/keycodes';
 import {Component, HostBinding, Input} from '@angular/core';
 import {FormControl} from '@angular/forms';
 import {MatChipInputEvent} from '@angular/material/chips';
-import {ParticipantIdLocalization} from '../../../../../core/services/participant-id-localization';
-import {removeOnce} from '../../../../../core/utils/array-utils';
+import {ParticipantIdLocalization} from '../../../core/services/participant-id-localization';
+import {removeOnce} from '../../../core/utils/array-utils';
 
 @Component({
   selector: 'participant-id-select',
diff --git a/src/app/component-library/policy-editor/editor/policy-operator-select/policy-operator-select.component.html b/src/app/shared/form-elements/policy-operator-select/policy-operator-select.component.html
similarity index 100%
rename from src/app/component-library/policy-editor/editor/policy-operator-select/policy-operator-select.component.html
rename to src/app/shared/form-elements/policy-operator-select/policy-operator-select.component.html
diff --git a/src/app/component-library/policy-editor/editor/policy-operator-select/policy-operator-select.component.ts b/src/app/shared/form-elements/policy-operator-select/policy-operator-select.component.ts
similarity index 87%
rename from src/app/component-library/policy-editor/editor/policy-operator-select/policy-operator-select.component.ts
rename to src/app/shared/form-elements/policy-operator-select/policy-operator-select.component.ts
index 90bfc6f25..3ae0c22c2 100644
--- a/src/app/component-library/policy-editor/editor/policy-operator-select/policy-operator-select.component.ts
+++ b/src/app/shared/form-elements/policy-operator-select/policy-operator-select.component.ts
@@ -1,7 +1,7 @@
 import {Component, HostBinding, Input} from '@angular/core';
 import {UntypedFormControl} from '@angular/forms';
-import {PolicyOperatorConfig} from '../../model/policy-operators';
 import {TranslateService} from '@ngx-translate/core';
+import {PolicyOperatorConfig} from '../../business/policy-editor/model/policy-operators';
 
 @Component({
   selector: 'policy-operator-select',
@@ -19,7 +19,6 @@ export class PolicyOperatorSelectComponent {
   cls = true;
 
   constructor(public translationService: TranslateService) {}
-  
+
   label = this.translationService.instant('general.operator');
-  
 }
diff --git a/src/app/component-library/edit-asset-form/transport-mode-select/transport-mode-select-data.ts b/src/app/shared/form-elements/transport-mode-select/transport-mode-select-data.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/transport-mode-select/transport-mode-select-data.ts
rename to src/app/shared/form-elements/transport-mode-select/transport-mode-select-data.ts
diff --git a/src/app/component-library/edit-asset-form/transport-mode-select/transport-mode-select-item.service.ts b/src/app/shared/form-elements/transport-mode-select/transport-mode-select-item.service.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/transport-mode-select/transport-mode-select-item.service.ts
rename to src/app/shared/form-elements/transport-mode-select/transport-mode-select-item.service.ts
diff --git a/src/app/component-library/edit-asset-form/transport-mode-select/transport-mode-select-item.ts b/src/app/shared/form-elements/transport-mode-select/transport-mode-select-item.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/transport-mode-select/transport-mode-select-item.ts
rename to src/app/shared/form-elements/transport-mode-select/transport-mode-select-item.ts
diff --git a/src/app/component-library/edit-asset-form/transport-mode-select/transport-mode-select.component.html b/src/app/shared/form-elements/transport-mode-select/transport-mode-select.component.html
similarity index 100%
rename from src/app/component-library/edit-asset-form/transport-mode-select/transport-mode-select.component.html
rename to src/app/shared/form-elements/transport-mode-select/transport-mode-select.component.html
diff --git a/src/app/component-library/edit-asset-form/transport-mode-select/transport-mode-select.component.ts b/src/app/shared/form-elements/transport-mode-select/transport-mode-select.component.ts
similarity index 100%
rename from src/app/component-library/edit-asset-form/transport-mode-select/transport-mode-select.component.ts
rename to src/app/shared/form-elements/transport-mode-select/transport-mode-select.component.ts
diff --git a/src/app/component-library/pipes-and-directives/directives/autofocus.direcitive.ts b/src/app/shared/pipes-and-directives/autofocus.direcitive.ts
similarity index 100%
rename from src/app/component-library/pipes-and-directives/directives/autofocus.direcitive.ts
rename to src/app/shared/pipes-and-directives/autofocus.direcitive.ts
diff --git a/src/app/component-library/pipes-and-directives/pipes/compare-by-field.pipe.ts b/src/app/shared/pipes-and-directives/compare-by-field.pipe.ts
similarity index 100%
rename from src/app/component-library/pipes-and-directives/pipes/compare-by-field.pipe.ts
rename to src/app/shared/pipes-and-directives/compare-by-field.pipe.ts
diff --git a/src/app/component-library/pipes-and-directives/directives/external-link.directive.ts b/src/app/shared/pipes-and-directives/external-link.directive.ts
similarity index 100%
rename from src/app/component-library/pipes-and-directives/directives/external-link.directive.ts
rename to src/app/shared/pipes-and-directives/external-link.directive.ts
diff --git a/src/app/component-library/pipes-and-directives/pipes/is-active-feature.pipe.ts b/src/app/shared/pipes-and-directives/is-active-feature.pipe.ts
similarity index 71%
rename from src/app/component-library/pipes-and-directives/pipes/is-active-feature.pipe.ts
rename to src/app/shared/pipes-and-directives/is-active-feature.pipe.ts
index a318481db..f39cf3ad8 100644
--- a/src/app/component-library/pipes-and-directives/pipes/is-active-feature.pipe.ts
+++ b/src/app/shared/pipes-and-directives/is-active-feature.pipe.ts
@@ -1,6 +1,6 @@
 import {Pipe, PipeTransform} from '@angular/core';
-import {ActiveFeatureSet} from '../../../core/config/active-feature-set';
-import {EdcUiFeature} from '../../../core/config/profiles/edc-ui-feature';
+import {ActiveFeatureSet} from '../../core/config/active-feature-set';
+import {EdcUiFeature} from '../../core/config/profiles/edc-ui-feature';
 
 /**
  * Easily check for active features in angular templates.
diff --git a/src/app/shared/pipes-and-directives/pipes-and-directives.module.ts b/src/app/shared/pipes-and-directives/pipes-and-directives.module.ts
new file mode 100644
index 000000000..ce627f17d
--- /dev/null
+++ b/src/app/shared/pipes-and-directives/pipes-and-directives.module.ts
@@ -0,0 +1,33 @@
+import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {MatIconModule} from '@angular/material/icon';
+import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
+import {AutofocusDirective} from './autofocus.direcitive';
+import {CompareByFieldPipe} from './compare-by-field.pipe';
+import {ExternalLinkDirective} from './external-link.directive';
+import {IsActiveFeaturePipe} from './is-active-feature.pipe';
+import {RemoveClassDirective} from './remove-class.directive';
+import {TrackByFieldDirective} from './track-by-field.directive';
+import {ValuesPipe} from './values.pipe';
+
+@NgModule({
+  imports: [
+    // Angular
+    CommonModule,
+
+    // Angular Material
+    MatIconModule,
+    MatProgressSpinnerModule,
+  ],
+  declarations: [],
+  exports: [
+    AutofocusDirective,
+    CompareByFieldPipe,
+    ExternalLinkDirective,
+    IsActiveFeaturePipe,
+    RemoveClassDirective,
+    TrackByFieldDirective,
+    ValuesPipe,
+  ],
+})
+export class PipesAndDirectivesModule {}
diff --git a/src/app/component-library/pipes-and-directives/directives/remove-class.directive.ts b/src/app/shared/pipes-and-directives/remove-class.directive.ts
similarity index 100%
rename from src/app/component-library/pipes-and-directives/directives/remove-class.directive.ts
rename to src/app/shared/pipes-and-directives/remove-class.directive.ts
diff --git a/src/app/component-library/pipes-and-directives/directives/track-by-field.directive.ts b/src/app/shared/pipes-and-directives/track-by-field.directive.ts
similarity index 100%
rename from src/app/component-library/pipes-and-directives/directives/track-by-field.directive.ts
rename to src/app/shared/pipes-and-directives/track-by-field.directive.ts
diff --git a/src/app/component-library/pipes-and-directives/pipes/values.pipe.ts b/src/app/shared/pipes-and-directives/values.pipe.ts
similarity index 100%
rename from src/app/component-library/pipes-and-directives/pipes/values.pipe.ts
rename to src/app/shared/pipes-and-directives/values.pipe.ts
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
new file mode 100644
index 000000000..25b656730
--- /dev/null
+++ b/src/app/shared/shared.module.ts
@@ -0,0 +1,287 @@
+import {ClipboardModule} from '@angular/cdk/clipboard';
+import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {MatBadgeModule} from '@angular/material/badge';
+import {MatButtonModule} from '@angular/material/button';
+import {MatButtonToggleModule} from '@angular/material/button-toggle';
+import {MatCardModule} from '@angular/material/card';
+import {MatCheckboxModule} from '@angular/material/checkbox';
+import {MatChipsModule} from '@angular/material/chips';
+import {
+  DateAdapter,
+  MAT_DATE_LOCALE,
+  MatNativeDateModule,
+} from '@angular/material/core';
+import {MatDatepickerModule} from '@angular/material/datepicker';
+import {MatDialogModule} from '@angular/material/dialog';
+import {MatDividerModule} from '@angular/material/divider';
+import {MatExpansionModule} from '@angular/material/expansion';
+import {
+  MAT_FORM_FIELD_DEFAULT_OPTIONS,
+  MatFormFieldDefaultOptions,
+  MatFormFieldModule,
+} from '@angular/material/form-field';
+import {MatGridListModule} from '@angular/material/grid-list';
+import {MatIconModule} from '@angular/material/icon';
+import {MatInputModule} from '@angular/material/input';
+import {MatListModule} from '@angular/material/list';
+import {MatMenuModule} from '@angular/material/menu';
+import {MatPaginatorModule} from '@angular/material/paginator';
+import {MatProgressBarModule} from '@angular/material/progress-bar';
+import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
+import {MatRadioModule} from '@angular/material/radio';
+import {MatSelectModule} from '@angular/material/select';
+import {MatSidenavModule} from '@angular/material/sidenav';
+import {MatSlideToggleModule} from '@angular/material/slide-toggle';
+import {MatSnackBarModule} from '@angular/material/snack-bar';
+import {MatStepperModule} from '@angular/material/stepper';
+import {MatTableModule} from '@angular/material/table';
+import {MatTabsModule} from '@angular/material/tabs';
+import {MatToolbarModule} from '@angular/material/toolbar';
+import {
+  MAT_TOOLTIP_DEFAULT_OPTIONS,
+  MAT_TOOLTIP_DEFAULT_OPTIONS_FACTORY,
+  MatTooltipDefaultOptions,
+  MatTooltipModule,
+} from '@angular/material/tooltip';
+import {TranslateModule} from '@ngx-translate/core';
+import {NgChartsModule} from 'ng2-charts';
+import {NgxJsonViewerModule} from 'ngx-json-viewer';
+import {CustomDateAdapter} from '../core/adapters/custom-date-adapter';
+import {AssetCardTagListComponent} from './business/asset-card-tag-list/asset-card-tag-list.component';
+import {AssetDetailDialogDataService} from './business/asset-detail-dialog/asset-detail-dialog-data.service';
+import {AssetDetailDialogComponent} from './business/asset-detail-dialog/asset-detail-dialog.component';
+import {AssetDetailDialogService} from './business/asset-detail-dialog/asset-detail-dialog.service';
+import {AssetPropertyGridGroupBuilder} from './business/asset-detail-dialog/asset-property-grid-group-builder';
+import {PolicyPropertyFieldBuilder} from './business/asset-detail-dialog/policy-property-field-builder';
+import {ConditionsForUseDialogComponent} from './business/conditions-for-use-dialog/conditions-for-use-dialog.component';
+import {ConditionsForUseDialogService} from './business/conditions-for-use-dialog/conditions-for-use-dialog.service';
+import {ContractOfferIconComponent} from './business/contract-offer-icon/contract-offer-icon.component';
+import {ContractOfferMiniListComponent} from './business/contract-offer-mini-list/contract-offer-mini-list.component';
+import {DataOfferCardsComponent} from './business/data-offer-cards/data-offer-cards.component';
+import {EditAssetFormComponent} from './business/edit-asset-form/edit-asset-form.component';
+import {InitiateNegotiationConfirmTosDialogComponent} from './business/initiate-negotiation-confirm-tos-dialog/initiate-negotiation-confirm-tos-dialog.component';
+import {PolicyFormAddMenuComponent} from './business/policy-editor/editor/policy-form-add-menu/policy-form-add-menu.component';
+import {PolicyFormExpressionConstraintComponent} from './business/policy-editor/editor/policy-form-expression-constraint/policy-form-expression-constraint.component';
+import {PolicyFormExpressionEmptyComponent} from './business/policy-editor/editor/policy-form-expression-empty/policy-form-expression-empty.component';
+import {PolicyFormExpressionMultiComponent} from './business/policy-editor/editor/policy-form-expression-multi/policy-form-expression-multi.component';
+import {PolicyFormExpressionComponent} from './business/policy-editor/editor/policy-form-expression/policy-form-expression.component';
+import {PolicyFormRemoveButton} from './business/policy-editor/editor/policy-form-remove-button/policy-form-remove-button.component';
+import {PolicyExpressionRecipeService} from './business/policy-editor/editor/recipes/policy-expression-recipe.service';
+import {TimespanRestrictionDialogComponent} from './business/policy-editor/editor/recipes/timespan-restriction-dialog/timespan-restriction-dialog.component';
+import {PolicyMapper} from './business/policy-editor/model/policy-mapper';
+import {PolicyMultiExpressionService} from './business/policy-editor/model/policy-multi-expressions';
+import {PolicyOperatorService} from './business/policy-editor/model/policy-operators';
+import {PolicyVerbService} from './business/policy-editor/model/policy-verbs';
+import {PolicyExpressionComponent} from './business/policy-editor/renderer/policy-expression/policy-expression.component';
+import {PolicyRendererComponent} from './business/policy-editor/renderer/policy-renderer/policy-renderer.component';
+import {TransferHistoryMiniListComponent} from './business/transfer-history-mini-list/transfer-history-mini-list.component';
+import {AgoComponent} from './common/ago/ago.component';
+import {AgoPipe} from './common/ago/ago.pipe';
+import {ConfirmationDialogComponent} from './common/confirmation-dialog/confirmation-dialog.component';
+import {DateComponent} from './common/date/date.component';
+import {EmptyStateComponent} from './common/empty-state/empty-state.component';
+import {ErrorStateComponent} from './common/error-state/error-state.component';
+import {HorizontalSectionDividerComponent} from './common/horizontal-section-divider/horizontal-section-divider.component';
+import {JsonDialogComponent} from './common/json-dialog/json-dialog.component';
+import {JsonDialogService} from './common/json-dialog/json-dialog.service';
+import {LanguageSelectorComponent} from './common/language-selector/language-selector.component';
+import {LoadingStateComponent} from './common/loading-state/loading-state.component';
+import {MarkdownDescriptionComponent} from './common/markdown-description/markdown-description.component';
+import {PropertyGridGroupComponent} from './common/property-grid-group/property-grid-group.component';
+import {PropertyGridComponent} from './common/property-grid/property-grid.component';
+import {TranslateWithSlotComponent} from './common/translate-with-slot/translate-with-slot.component';
+import {TruncatedShortDescription} from './common/truncated-short-description/truncated-short-description.component';
+import {UrlListDialogComponent} from './common/url-list-dialog/url-list-dialog.component';
+import {UrlListDialogService} from './common/url-list-dialog/url-list-dialog.service';
+import {DataAddressTypeSelectComponent} from './form-elements/data-address-type-select/data-address-type-select.component';
+import {DataCategorySelectComponent} from './form-elements/data-category-select/data-category-select.component';
+import {DataSubcategoryItemsPipe} from './form-elements/data-subcategory-select/data-subcategory-items.pipe';
+import {DataSubcategorySelectComponent} from './form-elements/data-subcategory-select/data-subcategory-select.component';
+import {EditAssetFormDataAddressTypeSelectComponent} from './form-elements/edit-asset-form-data-address-type-select/edit-asset-form-data-address-type-select.component';
+import {EditAssetFormGroupComponent} from './form-elements/edit-asset-form-group/edit-asset-form-group.component';
+import {EditAssetFormInputComponent} from './form-elements/edit-asset-form-input/edit-asset-form-input.component';
+import {EditAssetFormLabelComponent} from './form-elements/edit-asset-form-label/edit-asset-form-label.component';
+import {EditAssetFormTextareaComponent} from './form-elements/edit-asset-form-textarea/edit-asset-form-textarea.component';
+import {KeywordSelectComponent} from './form-elements/keyword-select/keyword-select.component';
+import {LanguageSelectComponent} from './form-elements/language-select/language-select.component';
+import {ParticipantIdSelectComponent} from './form-elements/participant-id-select/participant-id-select.component';
+import {PolicyOperatorSelectComponent} from './form-elements/policy-operator-select/policy-operator-select.component';
+import {TransportModeSelectComponent} from './form-elements/transport-mode-select/transport-mode-select.component';
+import {AutofocusDirective} from './pipes-and-directives/autofocus.direcitive';
+import {CompareByFieldPipe} from './pipes-and-directives/compare-by-field.pipe';
+import {ExternalLinkDirective} from './pipes-and-directives/external-link.directive';
+import {IsActiveFeaturePipe} from './pipes-and-directives/is-active-feature.pipe';
+import {RemoveClassDirective} from './pipes-and-directives/remove-class.directive';
+import {TrackByFieldDirective} from './pipes-and-directives/track-by-field.directive';
+import {ValuesPipe} from './pipes-and-directives/values.pipe';
+
+const COMPONENTS: NgModule['declarations'] = [
+  // ./common
+  AgoComponent,
+  AgoPipe,
+  ConfirmationDialogComponent,
+  DateComponent,
+  EmptyStateComponent,
+  ErrorStateComponent,
+  HorizontalSectionDividerComponent,
+  JsonDialogComponent,
+  LanguageSelectorComponent,
+  LoadingStateComponent,
+  MarkdownDescriptionComponent,
+  PropertyGridComponent,
+  PropertyGridGroupComponent,
+  TruncatedShortDescription,
+  UrlListDialogComponent,
+  TranslateWithSlotComponent,
+
+  // ./business
+  AssetCardTagListComponent,
+  AssetDetailDialogComponent,
+  ConditionsForUseDialogComponent,
+  ContractOfferIconComponent,
+  ContractOfferMiniListComponent,
+  DataOfferCardsComponent,
+  InitiateNegotiationConfirmTosDialogComponent,
+  TransferHistoryMiniListComponent,
+
+  // ./business/asset-edit-form
+  EditAssetFormComponent,
+  EditAssetFormGroupComponent,
+  EditAssetFormLabelComponent,
+  EditAssetFormInputComponent,
+  EditAssetFormTextareaComponent,
+  DataSubcategorySelectComponent,
+  DataSubcategoryItemsPipe,
+
+  // ./business/policy-editor
+  PolicyFormAddMenuComponent,
+  PolicyFormExpressionComponent,
+  PolicyFormExpressionEmptyComponent,
+  PolicyFormExpressionConstraintComponent,
+  PolicyFormExpressionMultiComponent,
+  PolicyFormRemoveButton,
+  TimespanRestrictionDialogComponent,
+  PolicyRendererComponent,
+  PolicyExpressionComponent,
+
+  // ./form-elements
+  DataAddressTypeSelectComponent,
+  DataCategorySelectComponent,
+  DataSubcategorySelectComponent,
+  DataSubcategoryItemsPipe,
+  EditAssetFormDataAddressTypeSelectComponent,
+  EditAssetFormGroupComponent,
+  EditAssetFormInputComponent,
+  EditAssetFormLabelComponent,
+  EditAssetFormTextareaComponent,
+  KeywordSelectComponent,
+  LanguageSelectorComponent,
+  LanguageSelectComponent,
+  ParticipantIdSelectComponent,
+  PolicyOperatorSelectComponent,
+  TransportModeSelectComponent,
+
+  // ./pipes-and-directives
+  AutofocusDirective,
+  CompareByFieldPipe,
+  ExternalLinkDirective,
+  IsActiveFeaturePipe,
+  RemoveClassDirective,
+  TrackByFieldDirective,
+  ValuesPipe,
+];
+
+const MODULES = [
+  // Angular
+  TranslateModule,
+
+  // Angular CDK
+  ClipboardModule,
+
+  // Angular Material
+  MatBadgeModule,
+  MatButtonModule,
+  MatButtonToggleModule,
+  MatCardModule,
+  MatCheckboxModule,
+  MatChipsModule,
+  MatDatepickerModule,
+  MatDialogModule,
+  MatDividerModule,
+  MatExpansionModule,
+  MatFormFieldModule,
+  MatGridListModule,
+  MatIconModule,
+  MatInputModule,
+  MatListModule,
+  MatMenuModule,
+  MatNativeDateModule,
+  MatPaginatorModule,
+  MatProgressBarModule,
+  MatProgressSpinnerModule,
+  MatRadioModule,
+  MatSelectModule,
+  MatSidenavModule,
+  MatSlideToggleModule,
+  MatSnackBarModule,
+  MatStepperModule,
+  MatTableModule,
+  MatTabsModule,
+  MatToolbarModule,
+  MatTooltipModule,
+
+  // NGX Json Viewer
+  NgxJsonViewerModule,
+
+  // NgCharts
+  NgChartsModule,
+];
+
+@NgModule({
+  imports: [
+    // Angular
+    CommonModule,
+    FormsModule,
+    ReactiveFormsModule,
+
+    // Angular Material
+    ...MODULES,
+  ],
+  exports: [...MODULES, ...COMPONENTS],
+  declarations: COMPONENTS,
+  providers: [
+    AssetDetailDialogDataService,
+    AssetDetailDialogService,
+    AssetPropertyGridGroupBuilder,
+    ConditionsForUseDialogService,
+    PolicyPropertyFieldBuilder,
+    JsonDialogService,
+    PolicyExpressionRecipeService,
+    UrlListDialogService,
+    PolicyMultiExpressionService,
+    PolicyOperatorService,
+    PolicyVerbService,
+    PolicyMapper,
+
+    {provide: DateAdapter, useClass: CustomDateAdapter},
+
+    {provide: MAT_DATE_LOCALE, useValue: 'en-GB'},
+    {
+      provide: MAT_FORM_FIELD_DEFAULT_OPTIONS,
+      useValue: {
+        appearance: 'outline',
+        color: 'accent',
+      } as MatFormFieldDefaultOptions,
+    },
+    {
+      provide: MAT_TOOLTIP_DEFAULT_OPTIONS,
+      useValue: <MatTooltipDefaultOptions>{
+        ...MAT_TOOLTIP_DEFAULT_OPTIONS_FACTORY(),
+        disableTooltipInteractivity: true,
+      },
+    },
+  ],
+})
+export class SharedModule {}
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index 501e23bbd..d57d0e024 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -16,19 +16,18 @@
     "detail": "Details",
     "warn": "Warnung",
     "title": "Titel",
-    "disable": "Deaktiviere",
-    "enable": "Aktiviere",
+    "disable": "Deaktivieren",
+    "enable": "Aktivieren",
     "show": "Zeige",
     "hide": "Verberge",
     "description": "Beschreibung",
     "loading": "Lädt...",
     "loading1": "Lädt",
-    "loading2": "Lädt noch...",
+    "still_loading": "Lädt noch...",
     "language": "Sprache",
     "value": "Wert",
     "method": "Methode",
     "method_para": "Parametrisierung der Methode",
-    "type": "Typ",
     "path": "Pfad",
     "params": "Abfrageparameter",
     "add_properties": "Weitere Eigenschaften",
@@ -66,7 +65,6 @@
     "consuming": "Eingehend",
     "providing": "Ausgehend",
     "endpoint": "Konnektor Endpunkt",
-    "doc": "Dokumentation",
     "endpoint_doc": "Endpunkt Dokumentation",
     "content": "Inhaltstyp",
     "publisher": "Anbieter",
@@ -86,16 +84,7 @@
     "add_header": "Zusätzliche Kopfzeilen",
     "header_name": "Kopfzeilen-Name",
     "header_value": "Kopfzeilen-Wert",
-    "add_add_header": "Füge zusätzliche Kopfzeile hinzu",
-	"operator": "Operator",
-	"show_adv_fields": "Erweiterte Felder anzeigen",
-	"publishing": "Veröffentlichung",
-	"publish": "veröffentlichen" ,
-	"pub_desc": "Datenangebot an andere Datenraumteilnehmer veröffentlichen",
-	"pub_unrestr": "Uneingeschränkt veröffentlichen",
-	"pub_restr": "Eingeschränkt veröffentlichen",
-	"pub_no": "Nicht veröffentlichen",
-	"pub_mode": "Veröffentlichungsmodus"
+    "add_add_header": "Füge zusätzliche Kopfzeile hinzu"
   },
   "tooltip": {
     "negotiate": "Sie können keine Verträge mit Ihrem eigenen Konnektor aushandeln.",
@@ -150,25 +139,10 @@
     "maintainer": "Name der betreuenden Organisation",
     "main_url": "URL betreuende Organisation"
   },
-  "create_data_offer": {
-    "def_datasrc": "Definieren Sie die Datenquelle für das Asset",
-	"data_type": "Datenquellen Typ",
-	"contact_email": "Kontakt E-Mail",
-	"contact_email_placeholder": "kontakt@ihre-org.com",
-	"contact_email_descr": "Diese E-Mail-Adresse wird potenziellen Kunden zur Kontaktaufnahme mit Ihnen angeboten. Dies geschieht anstelle der Anbindung einer tatsächlichen Datenquelle.",
-	"pref_email_sub": "Bevorzugter E-Mail-Betreff",
-	"pref_email_descr": "Wird dem Mailto-Link hinzugefügt und potenziellen Verbrauchern zur Nutzung angezeigt.",
-	"keep_datasrc": "Datenquelle beibehalten.",
-	"no_datasrc": "Ich habe keine Datenquelle.",
-	"con_datasrc": "Ich möchte eine Verbindung zu einer Datenquelle herstellen."
-  },
   "asset_page": {
     "information": "Generelle Informationen",
-	"information_desc": "Füllen Sie allgemeine Informationen über das Asset aus.",
-	"my_asset": "Mein Asset",
     "asset_id": "Datenbestand-ID",
-    "keywords": "Stichwörter",
-    "add_keyword": "Stichwörter hinzufügen...",
+    "keywords": "Passwort",
     "legal_name": "Rechtlicher Name des Dateninhabers",
     "add_file": "Referenzdatei hinzufügen",
     "file_des": "Beschreibung der Referenzdateien",
@@ -180,9 +154,7 @@
     "provide": "Die konsumierende Seite muss eine benutzerdefinierte HTTP-Methode mit aktivierter Methodenparametrisierung bereitstellen.",
     "http_subpath": "Die konsumierende Seite muss einen benutzerdefinierten HTTP-Unterpfad bereitstellen, bei dem die Methodenparametrisierung aktiviert ist. Der benutzerdefinierte HTTP-Teilpfad wird an den Basispfad angehängt.",
     "path_para": "Pfadparametrisierung",
-    "method_para": "Methodenparameterization",
     "query_para": "Abfrageparameter",
-    "query_para_single": "Abfrageparameter",
     "query_name": "Abfrage Parametername",
     "default_query": "Wenn die Parametrisierung von Abfrageparametern aktiviert ist, werden die Standardabfrageparameter und die vom Verbraucher bereitgestellten Abfrageparameter zusammengeführt.",
     "query_parameter": " Parametrisierung von Abfrageparametern",
@@ -196,9 +168,7 @@
     "no_assets": "Keine Datenbestände mit gegebenem Filter gefunden.",
     "descrip": "Die Beschreibung nutzt",
     "add_loc": "Füge Ort hinzu",
-    "add_sample": "Füge Beispieldaten hinzu",
-    "name": "Name",
-    "version": "Version"
+    "add_sample": "Füge Beispieldaten hinzu"
   },
   "catalog_browser_page": {
     "fetch": "Status abrufen",
@@ -263,22 +233,22 @@
     "api_url": "Management API URL",
     "edition_edc": "Basisausgabe EDC",
     "page": "klicken.",
-    "descrip2": "Dieser EDC Konnektor auf der Abo-Ebene Basic wird von sovity bereitgestellt, um Ihre ersten Schritte im Mobility Data Space (MDS) zu ermöglichen.",
-    "descrip3": "Für zusätzliche Funktionen und erweiterte Kapazitäten können Sie uns gerne kontaktieren.",
-    "descrip4": "Um Datenräume wie Mobility Data Space oder Catena-X innerhalb weniger Minuten zu verbinden, betrachten Sie die verwaltete Lösung von",
-    "descrip5": "- den Connector-as-a-Service (CaaS), der auf Open-Source-Software basiert und mit wichtigen Unternehmensfunktionen angereichert ist.",
-    "descrip6": "Das Eclipse Dataspace Components Framework ermöglicht einen souveränen, organisationsübergreifenden Datenaustausch.",
-    "descrip7": "Es implementiert den internationalen Datenraumstandard (IDS) sowie die mit GAIA-X verbundenen relevanten Protokolle.",
-    "descrip8": "Der Aufbau ist so erweiterbar wie möglich gestaltet, um die Integration in verschiedene Datenökosysteme zu fördern.",
-    "descrip9": "Beispielhafte Anwendungsfälle, die Sie mit dieser Anwendung ausprobieren können, sind:",
-    "descrip10": "Zeigen Sie den Datenbestands-Katalog an, der Ihnen in Ihrem Datenraum zur Verfügung steht, unter",
-    "descrip11": "Verhandeln Sie einen Vertrag für die gemeinsame Nutzung von Daten in Ihrem Datenraum unter",
-    "descrip12": "Übertragen Sie ein Element in Ihren Datenraum indem Sie auf ",
-    "descrip13": "Sehen Sie sich an, welche Datenbestände in Ihrem Datenraum übertragen wurden, indem Sie auf",
-    "descrip14": "Betrachten und erstellen Sie Datenbstände indem Sie auf",
-    "descrip15": "Betrachten und erstellen Sie Richtlinien und wenden Sie diese auf Datenbestände in Ihrem Datenraum an, indem Sie auf",
-    "descrip16": "Veröffentlichen Sie ein neues Element in Ihrem Datenraum unter",
-    "descrip17": "Betrachten Sie ihre existierenden Verträge, indem Sie auf",
+    "marketing_mds_basic_intro": "Dieser EDC Konnektor auf der Abo-Ebene Basic wird von sovity bereitgestellt, um Ihre ersten Schritte im Mobility Data Space (MDS) zu ermöglichen.",
+    "marketing_mds_basic_intro2": "Für zusätzliche Funktionen und erweiterte Kapazitäten können Sie uns gerne kontaktieren.",
+    "marketing_ce_intro": "Um Datenräume wie Mobility Data Space oder Catena-X innerhalb weniger Minuten zu verbinden, betrachten Sie die verwaltete Lösung von",
+    "marketing_ce_intro2": "- den Connector-as-a-Service (CaaS), der auf Open-Source-Software basiert und mit wichtigen Unternehmensfunktionen angereichert ist.",
+    "marketing_about": "Das Eclipse Dataspace Components Framework ermöglicht einen souveränen, organisationsübergreifenden Datenaustausch.",
+    "marketing_about2": "Es implementiert den internationalen Datenraumstandard (IDS) sowie die mit GAIA-X verbundenen relevanten Protokolle.",
+    "marketing_about3": "Der Aufbau ist so erweiterbar wie möglich gestaltet, um die Integration in verschiedene Datenökosysteme zu fördern.",
+    "marketing_about_ui": "Beispielhafte Anwendungsfälle, die Sie mit dieser Anwendung ausprobieren können, sind:",
+    "marketing_about_ui_catalog_view_offers": "Zeigen Sie den Datenbestands-Katalog an, der Ihnen in Ihrem Datenraum zur Verfügung steht, unter",
+    "marketing_about_ui_catalog_negotiate": "Verhandeln Sie einen Vertrag für die gemeinsame Nutzung von Daten in Ihrem Datenraum unter",
+    "marketing_about_ui_contracts_transfer": "Übertragen Sie ein Element in Ihren Datenraum indem Sie auf ",
+    "marketing_about_ui_transfer_history_view": "Sehen Sie sich an, welche Datenbestände in Ihrem Datenraum übertragen wurden, indem Sie auf",
+    "marketing_about_ui_assets_view_and_create": "Betrachten und erstellen Sie Datenbstände indem Sie auf",
+    "marketing_about_ui_policies_view_and_create": "Betrachten und erstellen Sie Richtlinien und wenden Sie diese auf Datenbestände in Ihrem Datenraum an, indem Sie auf",
+    "marketing_about_ui_contract_definitions_view_and_create": "Veröffentlichen Sie ein neues Element in Ihrem Datenraum unter",
+    "marketing_about_ui_contracts_view_existing": "Betrachten Sie ihre existierenden Verträge, indem Sie auf",
     "contact": "Kontaktieren Sie uns",
     "managed_edc": "Managed  EDC",
     "conn_service": "Konnektor als Dienstleistung",
@@ -298,8 +268,6 @@
   },
   "policy_definition_page": {
     "create_pol": "Erstelle eine neue Richtlinie",
-    "metadata": "Richtlinie Metadata",
-    "expression": "Richtlinieausdruck",
     "time_res": "Zeitlich begrenzter Zeitraum",
     "conn_res": "Anschluss mit vom Konnektor eingeschränkter Nutzung",
     "date_range": "Datumsbereich",
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 4b97b47fe..a79be9f0a 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -13,7 +13,6 @@
     "refresh": "Refresh",
     "total": "Total",
     "details": "Show Details",
-    "detail": "Details",
     "warn": "Warn",
     "title": "Title",
     "disable": "Disable",
@@ -23,12 +22,11 @@
     "description": "Description",
     "loading": "Loading...",
     "loading1": "Loading",
-    "loading2": " Still Loading...",
+    "still_loading": "Still Loading...",
     "language": "Language",
     "value": "Value",
     "method": "Method",
     "method_para": "Method Parameterization",
-    "type": "Type",
     "path": "Path",
     "params": "Query Params",
     "add_properties": "Additional Properties",
@@ -52,7 +50,7 @@
     "irr_pol": "Irregular Policy",
     "policy": "Contract Policy",
     "offer": "Contract Offer",
-    "con_def": "Contract Definition",
+    "con_def": "Data Offer",
     "cons": "Constraints",
     "body": "Body",
     "type": "Type",
@@ -66,7 +64,6 @@
     "consuming": "Consuming",
     "providing": "Providing",
     "endpoint": "Connector Endpoint",
-    "doc": "Documentation",
     "endpoint_doc": "Endpoint Documentation",
     "content": "Content Type",
     "publisher": "Publisher",
@@ -87,15 +84,7 @@
     "header_name": "Header Name",
     "header_value": "Header Value",
     "add_add_header": "Add Additional Header",
-	"operator": "Operator",
-	"show_adv_fields": "Show Advanced Fields",
-	"publishing": "Publishing",
-	"publish": "Publish" ,
-	"pub_desc": "Publish data offer to other data space participants",
-	"pub_unrestr": "Publish unrestricted",
-	"pub_restr": "Publish restricted",
-	"pub_no": "Do not publish",
-	"pub_mode": "Publishing Mode"
+    "page": "Page"
   },
   "tooltip": {
     "negotiate": "Cannot negotiate contracts with your own connector.",
@@ -117,7 +106,7 @@
   "component_library": {
     "delete_title": "Deletion confirmation",
     "delete_one": "Please confirm you want to delete",
-    "delete_two": ". This action cannot be undone.",
+    "delete_two": "This action cannot be undone.",
     "t_history": "Transfer History",
     "negotiate": "Negotiate",
     "negotiating": "Negotiating...",
@@ -150,22 +139,12 @@
     "maintainer": "Maintainer Organization Name",
     "main_url": "Maintainer URL"
   },
-  "create_data_offer": {
-    "def_datasrc": "Define the datasource of the asset",
-	"data_type": "Datasource Type",
-	"contact_email": "Contact E-Mail",
-	"contact_email_placeholder": "contact@my-org.com",
-	"contact_email_descr": "This email address will be offered to potential consumers for contacting you. This is done in place of having an actual data source connected.",
-	"pref_email_sub": "Preferred E-Mail Subject",
-	"pref_email_descr": "Will be added to the mailto-link and displayed to potential consumers to use.",
-	"keep_datasrc": "Keep the datasource unchanged.",
-	"no_datasrc": "I do not have a datasource.",
-	"con_datasrc": "I want to connect to a datasource."
-  },
-  "asset_page": {
+  "asset_list_page": {
+    "title": "Assets",
+    "page": "Asset Page",
     "information": "General Information",
-	"information_desc": "Fill out general information about the asset.",
-	"my_asset": "My Asset",
+    "information_desc": "Fill out general information about the asset.",
+    "my_asset": "My Asset",
     "asset_id": "Asset ID",
     "keywords": "Keywords",
     "add_keyword": "Add keyword...",
@@ -190,17 +169,18 @@
     "request_body": "Request Body",
     "request_para": "Request Body Parameterization",
     "search_assets": "Search assets",
-    "create_assets": "Create assets",
     "create_asset": " Create New Asset",
     "edit_asset": "Edit Asset",
     "no_assets": "No assets found with given filter.",
     "descrip": "The description uses",
     "add_loc": "Add location",
     "add_sample": "Add data sample",
-    "name": "Name",
+    "name": "Title",
     "version": "Version"
   },
   "catalog_browser_page": {
+    "title": "Catalog Browser",
+    "page": "Catalog Browser",
     "fetch": "Fetch Status",
     "endpoint_catalogs": "Other Connector Endpoint Catalogs",
     "search": "Search catalog",
@@ -211,6 +191,8 @@
     "usage": "Already using"
   },
   "contract_agreement_page": {
+    "title": "Contracts",
+    "page": "Contract Page",
     "search_agree": "Search contract agreements...",
     "no_agree": "No contract agreements yet.",
     "no_agree_found": "No contract agreements found with given filter.",
@@ -235,12 +217,24 @@
     "req_cont": "Custom Request Body Content Type",
     "req_body": "Custom Request Body",
     "cus_sub": "Custom Subpath",
-    "new_def": "Create New Contract Definition",
-    "search_def": "Search contract definitions",
-    "create_def": "Create Contract Definition",
-    "con_def": "No contract definition found with given filter."
+    "new_def": "Publish New Data Offer",
+    "search_def": "Search data offer",
+    "create_def": "Publish Data Offer",
+    "con_def": "No data offer found with given filter."
+  },
+  "contract_definition_page": {
+    "title": "Data Offers",
+    "page": "Data Offer Page"
+  },
+  "create_data_offer_page": {
+    "title": "Create Data Offer"
+  },
+  "edit_asset_page": {
+    "title": "Edit Asset"
   },
   "dashboard_page": {
+    "title": "Dashboard",
+    "page": "Dashboard Page",
     "error": "Error",
     "completed": "Completed",
     "progress": "In Progress",
@@ -262,23 +256,22 @@
     "conn_end": "Connector Endpoint",
     "api_url": "Management API URL",
     "edition_edc": "Basic Edition EDC",
-    "page": "Page",
-    "descrip2": "This EDC Connector on the subscription level Basic is provided by sovity to enable your first steps in the Mobility Data Space (MDS).",
-    "descrip3": "For additional features and advanced capacities, please feel free to contact us.",
-    "descrip4": "To join data spaces like Mobility Data Space or Catena-X within minutes, consider the managed solution by",
-    "descrip5": "- the Connector-as-a-Service (CaaS) based on open-source software enriched with key enterprise features.",
-    "descrip6": "The Eclipse Dataspace Components framework facilitates sovereign, inter-organizational data exchange.",
-    "descrip7": "It implements the International Data Spaces standard (IDS) as well as relevant protocols associated with GAIA-X.",
-    "descrip8": "The framework is designed as extensible as possible to encourage integrations into various data ecosystems.",
-    "descrip9": "Example use cases, that you can try out with this application, are:",
-    "descrip10": "View the asset catalog available to you in your Dataspace using the",
-    "descrip11": "Negotiate a contract for data sharing in your Dataspace using the",
-    "descrip12": "Transfer an asset in your Dataspace using the",
-    "descrip13": "View which assets have been transferred in your Dataspace in the",
-    "descrip14": "View and create assets using the",
-    "descrip15": "View and create policies and apply these to assets in your Dataspace using the",
-    "descrip16": "Publish a new asset into your Dataspace using the",
-    "descrip17": "View your existing contracts in the",
+    "marketing_mds_basic_intro": "This EDC Connector on the subscription level Basic is provided by sovity to enable your first steps in the Mobility Data Space (MDS).",
+    "marketing_mds_basic_intro2": "For additional features and advanced capacities, please feel free to contact us.",
+    "marketing_ce_intro": "To join data spaces like Mobility Data Space or Catena-X within minutes, consider the managed solution by",
+    "marketing_ce_intro2": "- the Connector-as-a-Service (CaaS) based on open-source software enriched with key enterprise features.",
+    "marketing_about": "The Eclipse Dataspace Components framework facilitates sovereign, inter-organizational data exchange.",
+    "marketing_about2": "It implements the International Data Spaces standard (IDS) as well as relevant protocols associated with GAIA-X.",
+    "marketing_about3": "The framework is designed as extensible as possible to encourage integrations into various data ecosystems.",
+    "marketing_about_ui": "Example use cases, that you can try out with this application, are:",
+    "marketing_about_ui_catalog_view_offers": "View the asset catalog available to you in your Dataspace using the {}",
+    "marketing_about_ui_catalog_negotiate": "Negotiate a contract for data sharing in your Dataspace using the {}",
+    "marketing_about_ui_contracts_transfer": "Transfer an asset in your Dataspace using the {}",
+    "marketing_about_ui_transfer_history_view": "View which assets have been transferred in your Dataspace in the {}",
+    "marketing_about_ui_assets_view_and_create": "View and create assets using the {}",
+    "marketing_about_ui_policies_view_and_create": "View and create policies and apply these to assets in your Dataspace using the {}",
+    "marketing_about_ui_contract_definitions_view_and_create": "Publish an asset into your Dataspace using the {}",
+    "marketing_about_ui_contracts_view_existing": "View your existing contracts in the {}",
     "contact": "Contact us",
     "managed_edc": "Get Managed EDC",
     "conn_service": "Connector-as-a-Service",
@@ -297,9 +290,9 @@
     "con_agree": "Contract Agreements"
   },
   "policy_definition_page": {
+    "title": "Policies",
+    "page": "Policy Page",
     "create_pol": "Create New Policy",
-    "metadata": "Policy Metadata",
-    "expression": "Policy Expression",
     "time_res": "Time-Period-Restricted",
     "conn_res": "Connector-Restricted-Usage",
     "date_range": "Date Range",
@@ -307,12 +300,20 @@
     "create_policy": "Create Policy",
     "no_pol": "No policy found with given filter."
   },
+  "create_policy_page": {
+    "title": "Create Policy"
+  },
   "transfer_history_page": {
+    "title": "Transfer History",
+    "page": "Transfer History Page",
     "subtitle": "Transfer History Details",
     "no_trans": "No transfer history found.",
     "counter_endpoint": "Counterparty Connector Endpoint",
     "counter_id": "Counterparty Participant ID"
   },
+  "logout_page": {
+    "title": "Logout"
+  },
   "connector_ui": {
     "dashboard": "Dashboard",
     "catalog": "Catalog Browser",
diff --git a/src/styles.scss b/src/styles.scss
index 5fcd9403c..464185a7e 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -82,8 +82,6 @@ body {
 .link {
   color: var(--link-color);
   text-decoration: none;
-  display: flex;
-  align-items: center;
 
   &:hover,
   &:focus {

From d4a21b464d1a606bf9b583c96b9f4f48859dd0c0 Mon Sep 17 00:00:00 2001
From: Richard Treier <richard.treier@sovity.de>
Date: Mon, 16 Sep 2024 15:05:03 +0200
Subject: [PATCH 4/5] fix: english language flag

---
 src/assets/images/flags/en.svg | 73 +++++++++++++++++++++++++++-------
 1 file changed, 59 insertions(+), 14 deletions(-)

diff --git a/src/assets/images/flags/en.svg b/src/assets/images/flags/en.svg
index 56487b083..c52d43125 100644
--- a/src/assets/images/flags/en.svg
+++ b/src/assets/images/flags/en.svg
@@ -1,16 +1,61 @@
-<?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 30" width="1200" height="600">
-<clipPath id="s">
-	<path d="M0,0 v30 h60 v-30 z"/>
-</clipPath>
-<clipPath id="t">
-	<path d="M30,15 h30 v15 z v15 h-30 z h-30 v-15 z v-15 h30 z"/>
-</clipPath>
-<g clip-path="url(#s)">
-	<path d="M0,0 v30 h60 v-30 z" fill="#012169"/>
-	<path d="M0,0 L60,30 M60,0 L0,30" stroke="#fff" stroke-width="6"/>
-	<path d="M0,0 L60,30 M60,0 L0,30" clip-path="url(#t)" stroke="#C8102E" stroke-width="4"/>
-	<path d="M30,0 v30 M0,15 h60" stroke="#fff" stroke-width="10"/>
-	<path d="M30,0 v30 M0,15 h60" stroke="#C8102E" stroke-width="6"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1300" height="650">
+<defs>
+<polygon id="pt" points="-0.1624598481164531,0 0,-0.5 0.1624598481164531,0" transform="scale(0.0616)" fill="#FFF"/>
+<g id="star">
+	<use xlink:href="#pt" transform="rotate(-144)"/>
+	<use xlink:href="#pt" transform="rotate(-72)"/>
+	<use xlink:href="#pt"/>
+	<use xlink:href="#pt" transform="rotate(72)"/>
+	<use xlink:href="#pt" transform="rotate(144)"/>
 </g>
+<g id="s5">
+	<use xlink:href="#star" x="-0.252"/>
+	<use xlink:href="#star" x="-0.126"/>
+	<use xlink:href="#star"/>
+	<use xlink:href="#star" x="0.126"/>
+	<use xlink:href="#star" x="0.252"/>
+</g>
+<g id="s6">
+	<use xlink:href="#s5" x="-0.063"/>
+	<use xlink:href="#star" x="0.315"/>
+</g>
+<g id="x4">
+	<use xlink:href="#s6"/>
+	<use xlink:href="#s5" y="0.054"/>
+	<use xlink:href="#s6" y="0.108"/>
+	<use xlink:href="#s5" y="0.162"/>
+</g>
+<g id="u">
+	<use xlink:href="#x4" y="-0.216"/>
+	<use xlink:href="#x4"/>
+	<use xlink:href="#s6" y="0.216"/>
+</g>
+<rect id="stripe" width="1300" height="50" fill="#B22234"/>
+</defs>
+<rect width="1300" height="650" fill="#FFF"/>
+<use xlink:href="#stripe"/>
+<use xlink:href="#stripe" y="100"/>
+<use xlink:href="#stripe" y="200"/>
+<use xlink:href="#stripe" y="300"/>
+<use xlink:href="#stripe" y="400"/>
+<use xlink:href="#stripe" y="500"/>
+<use xlink:href="#stripe" y="600"/>
+<rect width="494" height="350" fill="#3C3B6E"/>
+<use xlink:href="#u" transform="translate(247,175) scale(650)"/>
+<svg viewBox="0 0 60 30" width="1300" height="650">
+	<clipPath id="t">
+		<path d="M30,15L60,30V15H0V30H30z"/>
+	</clipPath>
+	<clipPath id="uk">
+		<path d="M0,30H60V0z"/>
+	</clipPath>
+	<g clip-path="url(#uk)">
+		<path d="M0,0 v30 h60 v-30 z" fill="#00247d"/>
+		<path d="M0,0 L60,30 M60,0 L0,30" stroke="#fff" stroke-width="6"/>
+		<path d="M0,30 L30,15 L60,30" clip-path="url(#t)" fill="none" stroke="#cf142b" stroke-width="4"/>
+		<path d="M30,0 v30 M0,15 h60" stroke="#fff" stroke-width="10"/>
+		<path d="M30,0 v30 M0,15 h60" stroke="#cf142b" stroke-width="6"/>
+	</g>
 </svg>
+</svg>
\ No newline at end of file

From 875fe2727fbb8be2f1df8f0a0360a1c7289f851b Mon Sep 17 00:00:00 2001
From: Richard Treier <richard.treier@sovity.de>
Date: Mon, 16 Sep 2024 15:11:05 +0200
Subject: [PATCH 5/5] chore: review remarks

---
 .../services/participant-id-localization.ts   |  8 +++--
 .../asset-create-dialog.component.html        |  6 ++--
 .../contract-definition-cards.component.html  |  2 +-
 .../contract-definition-cards.component.ts    |  2 +-
 ...ct-definition-editor-dialog.component.html |  2 +-
 .../dashboard-page-data.service.ts            |  2 +-
 ...policy-definition-create-page.component.ts |  8 +++--
 .../policy-cards/policy-cards.component.html  |  2 +-
 .../policy-cards/policy-cards.component.ts    |  4 +--
 .../transfer-history-page.component.ts        |  8 +++--
 .../asset-detail-dialog.component.ts          |  2 +-
 .../asset-property-grid-group-builder.ts      | 22 +++++++------
 .../policy-property-field-builder.ts          |  5 +--
 .../contract-offer-mini-list.component.html   |  2 +-
 .../confirmation-dialog.component.ts          |  6 ++--
 .../property-grid-group.component.html        |  2 +-
 .../translate-with-slot.component.html        |  8 +++--
 .../pipes-and-directives.module.ts            | 33 -------------------
 src/assets/i18n/de.json                       | 22 ++++++-------
 src/assets/i18n/en.json                       | 30 +++++++++--------
 20 files changed, 81 insertions(+), 95 deletions(-)
 delete mode 100644 src/app/shared/pipes-and-directives/pipes-and-directives.module.ts

diff --git a/src/app/core/services/participant-id-localization.ts b/src/app/core/services/participant-id-localization.ts
index d453027da..ad0e2f313 100644
--- a/src/app/core/services/participant-id-localization.ts
+++ b/src/app/core/services/participant-id-localization.ts
@@ -11,18 +11,22 @@ export class ParticipantIdLocalization {
     this.translateService
       .stream([
         'component_library.connector_id',
+        'component_library.connector_id_plural',
         'component_library.participant_id',
+        'component_library.participant_id_plural',
       ])
       .subscribe((translations) => {
         this.participantId = this.mds
           ? translations['component_library.connector_id']
           : translations['component_library.participant_id'];
-        this.participantIdPlural = this.participantId + 's';
+        this.participantIdPlural = this.mds
+          ? translations['component_library.connector_id_plural']
+          : translations['component_library.participant_id_plural'];
       });
   }
   private mds = this.config.features.has('mds-connector-id');
   participantId = ''; // init, will be updated by translateService
-  participantIdPlural = this.participantId + 's';
+  participantIdPlural = '';
   participantIdPlaceholder = this.mds
     ? 'MDSL1234XX.C1234XX'
     : 'other-connector-participant-id';
diff --git a/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog.component.html b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog.component.html
index d94002753..f8ebab355 100644
--- a/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog.component.html
+++ b/src/app/routes/connector-ui/asset-list-page/asset-create-dialog/asset-create-dialog.component.html
@@ -111,7 +111,7 @@ <h1 mat-dialog-title>
           <div class="flex flex-row space-x-[10px]">
             <!-- Content Type -->
             <mat-form-field class="grow mb-2">
-              <mat-label>{{ 'general.content' | translate }}</mat-label>
+              <mat-label>{{ 'general.content_type' | translate }}</mat-label>
               <input
                 matInput
                 [formControl]="form.metadata.controls.contentType"
@@ -169,7 +169,9 @@ <h1 mat-dialog-title>
             <mat-form-field
               *ngIf="form.metadata.controls.standardLicense; let ctrl"
               class="grow">
-              <mat-label>{{ 'general.st_license' | translate }}</mat-label>
+              <mat-label>{{
+                'general.standard_license' | translate
+              }}</mat-label>
               <input placeholder="https://" matInput [formControl]="ctrl" />
               <button
                 class="!scale-[0.9]"
diff --git a/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.html b/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.html
index 9e22253b4..f221f9ea0 100644
--- a/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.html
+++ b/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.html
@@ -34,7 +34,7 @@
       </div>
       <div class="flex flex-col">
         <div class="text-slate text-sm uppercase tracking-wider">
-          {{ 'general.policy' | translate }}
+          {{ 'general.contract_policy' | translate }}
         </div>
         <div>
           <a
diff --git a/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.ts b/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.ts
index 65149f27c..60b44cbaf 100644
--- a/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.ts
+++ b/src/app/routes/connector-ui/contract-definition-page/contract-definition-cards/contract-definition-cards.component.ts
@@ -78,7 +78,7 @@ export class ContractDefinitionCardsComponent implements OnDestroy {
         text: 'Delete',
         icon: 'delete',
         confirmation: ConfirmDialogModel.forDelete(
-          'data offer', // TODO
+          'general.con_def',
           card.id,
           this.translateService,
         ),
diff --git a/src/app/routes/connector-ui/contract-definition-page/contract-definition-editor-dialog/contract-definition-editor-dialog.component.html b/src/app/routes/connector-ui/contract-definition-page/contract-definition-editor-dialog/contract-definition-editor-dialog.component.html
index c85bd6d0b..2afc7aa6c 100644
--- a/src/app/routes/connector-ui/contract-definition-page/contract-definition-editor-dialog/contract-definition-editor-dialog.component.html
+++ b/src/app/routes/connector-ui/contract-definition-page/contract-definition-editor-dialog/contract-definition-editor-dialog.component.html
@@ -22,7 +22,7 @@ <h1 mat-dialog-title>{{ 'contract_agreement_page.new_def' | translate }}</h1>
 
     <!-- Contract Policy -->
     <policy-select
-      [label]="'general.policy' | translate"
+      [label]="'general.contract_policy' | translate"
       [control]="form.group.controls.contractPolicy"
       [policies]="policies"></policy-select>
 
diff --git a/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page-data.service.ts b/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page-data.service.ts
index 47ac7f86e..c2afe5432 100644
--- a/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page-data.service.ts
+++ b/src/app/routes/connector-ui/dashboard-page/dashboard-page/dashboard-page-data.service.ts
@@ -107,7 +107,7 @@ export class DashboardPageDataService {
       totalLabel: this.translateService.instant('general.total'),
       totalValue: total,
       isEmpty: !total,
-      emptyMessage: emptyMessage,
+      emptyMessage,
       labels: amounts.map((it) => it.label),
       datasets: [
         {
diff --git a/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page.component.ts b/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page.component.ts
index e14bb9fae..e0d9d0c2a 100644
--- a/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page.component.ts
+++ b/src/app/routes/connector-ui/policy-definition-create-page/policy-definition-create-page/policy-definition-create-page.component.ts
@@ -53,9 +53,11 @@ export class PolicyDefinitionCreatePageComponent implements OnDestroy {
           this.router.navigate(['/policies']);
         },
         error: (error) => {
-          const fai_pol = this.translateService.instant('notification.fai_pol');
-          console.error(fai_pol, error);
-          this.notificationService.showError(fai_pol);
+          const message = this.translateService.instant(
+            'notification.failed_create_policy',
+          );
+          console.error(message, error);
+          this.notificationService.showError(message);
         },
       });
   }
diff --git a/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.html b/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.html
index 9026ea10a..d63600a11 100644
--- a/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.html
+++ b/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.html
@@ -12,7 +12,7 @@
           {{ policyCard.id }}
         </a>
       </mat-card-title>
-      <mat-card-subtitle>{{ 'general.pol' | translate }}</mat-card-subtitle>
+      <mat-card-subtitle>{{ 'general.policy' | translate }}</mat-card-subtitle>
     </mat-card-header>
     <mat-card-content class="flex flex-col space-y-[16px]">
       <app-policy-renderer
diff --git a/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.ts b/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.ts
index 2b0659123..e2ea37634 100644
--- a/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.ts
+++ b/src/app/routes/connector-ui/policy-definition-page/policy-cards/policy-cards.component.ts
@@ -46,14 +46,14 @@ export class PolicyCardsComponent {
     let dialogRef: MatDialogRef<any>;
     const data: JsonDialogData = {
       title: policyCard.id,
-      subtitle: this.translateService.instant('general.pol'),
+      subtitle: this.translateService.instant('general.policy'),
       icon: 'policy',
       objectForJson: policyCard.objectForJson,
       toolbarButton: {
         text: this.translateService.instant('general.delete'),
         icon: 'delete',
         confirmation: ConfirmDialogModel.forDelete(
-          'policy',
+          'general.policy',
           policyCard.id,
           this.translateService,
         ),
diff --git a/src/app/routes/connector-ui/transfer-history-page/transfer-history-page/transfer-history-page.component.ts b/src/app/routes/connector-ui/transfer-history-page/transfer-history-page/transfer-history-page.component.ts
index 1d002bc79..baa1dd7bf 100644
--- a/src/app/routes/connector-ui/transfer-history-page/transfer-history-page/transfer-history-page.component.ts
+++ b/src/app/routes/connector-ui/transfer-history-page/transfer-history-page/transfer-history-page.component.ts
@@ -83,9 +83,11 @@ export class TransferHistoryPageComponent implements OnInit, OnDestroy {
         this.assetDetailDialogService.open(data, this.ngOnDestroy$);
       },
       error: (error) => {
-        const fai_fet = this.translateService.instant('notification.fai_fet');
-        console.error(fai_fet, error);
-        this.notificationService.showError(fai_fet);
+        const message = this.translateService.instant(
+          'notification.failed_transfer_detail_fetch',
+        );
+        console.error(message, error);
+        this.notificationService.showError(message);
       },
     });
   }
diff --git a/src/app/shared/business/asset-detail-dialog/asset-detail-dialog.component.ts b/src/app/shared/business/asset-detail-dialog/asset-detail-dialog.component.ts
index 21fca9021..3c7e526fb 100644
--- a/src/app/shared/business/asset-detail-dialog/asset-detail-dialog.component.ts
+++ b/src/app/shared/business/asset-detail-dialog/asset-detail-dialog.component.ts
@@ -200,7 +200,7 @@ export class AssetDetailDialogComponent implements OnDestroy {
 
   private confirmDelete(): Observable<boolean> {
     const dialogData = ConfirmDialogModel.forDelete(
-      'asset',
+      'general.asset',
       this.asset.title,
       this.translateService,
     );
diff --git a/src/app/shared/business/asset-detail-dialog/asset-property-grid-group-builder.ts b/src/app/shared/business/asset-detail-dialog/asset-property-grid-group-builder.ts
index ffa01510e..5007ffcc6 100644
--- a/src/app/shared/business/asset-detail-dialog/asset-property-grid-group-builder.ts
+++ b/src/app/shared/business/asset-detail-dialog/asset-property-grid-group-builder.ts
@@ -56,7 +56,7 @@ export class AssetPropertyGridGroupBuilder {
       },
       {
         icon: 'gavel',
-        label: this.translateService.instant('general.st_license'),
+        label: this.translateService.instant('general.standard_license'),
         ...this.propertyGridUtils.guessValue(asset.licenseUrl),
       },
       {
@@ -125,7 +125,7 @@ export class AssetPropertyGridGroupBuilder {
     if (asset.mediaType) {
       fields.push({
         icon: 'category',
-        label: this.translateService.instant('general.content'),
+        label: this.translateService.instant('general.content_type'),
         ...this.propertyGridUtils.guessValue(asset.mediaType),
       });
     }
@@ -169,7 +169,9 @@ export class AssetPropertyGridGroupBuilder {
 
     return [
       {
-        groupLabel: this.translateService.instant('general.add_properties'),
+        groupLabel: this.translateService.instant(
+          'general.additional_properties',
+        ),
         properties: additionalProperties,
       },
       {
@@ -188,35 +190,35 @@ export class AssetPropertyGridGroupBuilder {
     if (asset.transportMode) {
       fields.push({
         icon: 'commute',
-        label: this.translateService.instant('general.transport'),
+        label: this.translateService.instant('general.transport_mode'),
         ...this.propertyGridUtils.guessValue(asset.transportMode?.label),
       });
     }
     if (asset.dataCategory) {
       fields.push({
         icon: 'commute',
-        label: this.translateService.instant('general.category'),
+        label: this.translateService.instant('general.data_category'),
         ...this.propertyGridUtils.guessValue(asset.dataCategory?.label),
       });
     }
     if (asset.dataSubcategory) {
       fields.push({
         icon: 'commute',
-        label: this.translateService.instant('general.subcategory'),
+        label: this.translateService.instant('general.data_subcategory'),
         ...this.propertyGridUtils.guessValue(asset.dataSubcategory?.label),
       });
     }
     if (asset.dataModel) {
       fields.push({
         icon: 'category',
-        label: this.translateService.instant('general.model'),
+        label: this.translateService.instant('general.data_model'),
         ...this.propertyGridUtils.guessValue(asset.dataModel),
       });
     }
     if (asset.geoReferenceMethod) {
       fields.push({
         icon: 'commute',
-        label: this.translateService.instant('general.geo_method'),
+        label: this.translateService.instant('general.geo_reference_method'),
         ...this.propertyGridUtils.guessValue(asset.geoReferenceMethod),
       });
     }
@@ -342,10 +344,10 @@ export class AssetPropertyGridGroupBuilder {
     subtitle: string,
   ): PropertyGridGroup {
     return {
-      groupLabel: this.translateService.instant('general.policy'),
+      groupLabel: this.translateService.instant('general.contract_policy'),
       properties: this.policyPropertyFieldBuilder.buildPolicyPropertyFields(
         contractPolicy,
-        this.translateService.instant('general.policy') + ' JSON-LD',
+        this.translateService.instant('general.contract_policy') + ' JSON-LD',
         subtitle,
       ),
     };
diff --git a/src/app/shared/business/asset-detail-dialog/policy-property-field-builder.ts b/src/app/shared/business/asset-detail-dialog/policy-property-field-builder.ts
index 67ca039a9..c5fa5478c 100644
--- a/src/app/shared/business/asset-detail-dialog/policy-property-field-builder.ts
+++ b/src/app/shared/business/asset-detail-dialog/policy-property-field-builder.ts
@@ -21,14 +21,15 @@ export class PolicyPropertyFieldBuilder {
     return [
       {
         icon: 'policy',
-        label: this.translateService.instant('general.policy'),
+        label: this.translateService.instant('general.contract_policy'),
         policy: this.policyMapper.buildPolicy(policy.expression!),
         policyErrors: policy.errors || [],
         additionalContainerClasses: 'col-span-2',
       },
       {
         icon: 'policy',
-        label: this.translateService.instant('general.policy') + ' JSON-LD',
+        label:
+          this.translateService.instant('general.contract_policy') + ' JSON-LD',
         text: this.translateService.instant('component_library.json_ld'),
         onclick: () =>
           this.jsonDialogService.showJsonDetailDialog({
diff --git a/src/app/shared/business/contract-offer-mini-list/contract-offer-mini-list.component.html b/src/app/shared/business/contract-offer-mini-list/contract-offer-mini-list.component.html
index 0e2fa994b..33722f0ac 100644
--- a/src/app/shared/business/contract-offer-mini-list/contract-offer-mini-list.component.html
+++ b/src/app/shared/business/contract-offer-mini-list/contract-offer-mini-list.component.html
@@ -10,7 +10,7 @@
     class="flex flex-row items-center space-x-[5px] property-grid-group-title">
     <span>
       <span>
-        {{ 'general.offer' | translate }}
+        {{ 'general.contract_offer' | translate }}
         {{ data.contractOffers.length >= 2 ? i + 1 : '' }}
       </span>
     </span>
diff --git a/src/app/shared/common/confirmation-dialog/confirmation-dialog.component.ts b/src/app/shared/common/confirmation-dialog/confirmation-dialog.component.ts
index 7f97381e9..caaa35d0f 100644
--- a/src/app/shared/common/confirmation-dialog/confirmation-dialog.component.ts
+++ b/src/app/shared/common/confirmation-dialog/confirmation-dialog.component.ts
@@ -65,7 +65,7 @@ export class ConfirmDialogModel {
   }
 
   public static forDelete(
-    type: string,
+    typeKey: string,
     identifier: string,
     translateService: TranslateService,
   ): ConfirmDialogModel {
@@ -73,7 +73,9 @@ export class ConfirmDialogModel {
       `${translateService.instant('component_library.delete_title')}`,
       `${translateService.instant(
         'component_library.delete_one',
-      )} ${type} ${identifier}. ${translateService.instant(
+      )} ${translateService.instant(
+        typeKey,
+      )} ${identifier}. ${translateService.instant(
         'component_library.delete_two',
       )}`,
     );
diff --git a/src/app/shared/common/property-grid-group/property-grid-group.component.html b/src/app/shared/common/property-grid-group/property-grid-group.component.html
index bbf69da23..7d2ee5de2 100644
--- a/src/app/shared/common/property-grid-group/property-grid-group.component.html
+++ b/src/app/shared/common/property-grid-group/property-grid-group.component.html
@@ -6,7 +6,7 @@
   <div
     *ngIf="propGroup.groupLabel != null"
     class="flex flex-row flex-wrap property-grid-group-title"
-    [style]="first ? 'margin-top: 20px;' : ''">
+    [style.margin-top.px]="first ? 20 : null">
     {{ propGroup.groupLabel }}
   </div>
   <property-grid
diff --git a/src/app/shared/common/translate-with-slot/translate-with-slot.component.html b/src/app/shared/common/translate-with-slot/translate-with-slot.component.html
index a8dbf78c8..50702d8a7 100644
--- a/src/app/shared/common/translate-with-slot/translate-with-slot.component.html
+++ b/src/app/shared/common/translate-with-slot/translate-with-slot.component.html
@@ -1,3 +1,5 @@
-<span>{{ textBefore }}</span>
-<ng-content *ngIf="hasMiddle"></ng-content>
-<span>{{ textAfter }}</span>
+<span *ngIf="textBefore">{{ textBefore }}</span>
+<ng-container *ngIf="hasMiddle">
+  <ng-content></ng-content>
+</ng-container>
+<span *ngIf="textAfter">{{ textAfter }}</span>
diff --git a/src/app/shared/pipes-and-directives/pipes-and-directives.module.ts b/src/app/shared/pipes-and-directives/pipes-and-directives.module.ts
deleted file mode 100644
index ce627f17d..000000000
--- a/src/app/shared/pipes-and-directives/pipes-and-directives.module.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {MatIconModule} from '@angular/material/icon';
-import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
-import {AutofocusDirective} from './autofocus.direcitive';
-import {CompareByFieldPipe} from './compare-by-field.pipe';
-import {ExternalLinkDirective} from './external-link.directive';
-import {IsActiveFeaturePipe} from './is-active-feature.pipe';
-import {RemoveClassDirective} from './remove-class.directive';
-import {TrackByFieldDirective} from './track-by-field.directive';
-import {ValuesPipe} from './values.pipe';
-
-@NgModule({
-  imports: [
-    // Angular
-    CommonModule,
-
-    // Angular Material
-    MatIconModule,
-    MatProgressSpinnerModule,
-  ],
-  declarations: [],
-  exports: [
-    AutofocusDirective,
-    CompareByFieldPipe,
-    ExternalLinkDirective,
-    IsActiveFeaturePipe,
-    RemoveClassDirective,
-    TrackByFieldDirective,
-    ValuesPipe,
-  ],
-})
-export class PipesAndDirectivesModule {}
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index d57d0e024..c13c543a3 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -30,12 +30,12 @@
     "method_para": "Parametrisierung der Methode",
     "path": "Pfad",
     "params": "Abfrageparameter",
-    "add_properties": "Weitere Eigenschaften",
-    "category": "Datenkategorie",
-    "subcategory": "Datenunterkategorie",
-    "model": "Datenmodell",
-    "transport": "Transportmodus",
-    "geo_method": "Georeferenz-Methode",
+    "additional_properties": "Weitere Eigenschaften",
+    "data_category": "Datenkategorie",
+    "data_subcategory": "Datenunterkategorie",
+    "data_model": "Datenmodell",
+    "transport_mode": "Transportmodus",
+    "geo_reference_method": "Georeferenz-Methode",
     "geo_location": "Geo-Standort",
     "sovereign": "Souverän",
     "frequency": "Häufigkeit der Datenaktualisierung",
@@ -66,9 +66,9 @@
     "providing": "Ausgehend",
     "endpoint": "Konnektor Endpunkt",
     "endpoint_doc": "Endpunkt Dokumentation",
-    "content": "Inhaltstyp",
+    "content_type": "Inhaltstyp",
     "publisher": "Anbieter",
-    "st_license": "Standardlizenz",
+    "standard_license": "Standardlizenz",
     "ad_info": "Weitere Informationen",
     "id": "Vertragsangebot ID",
     "oth_connector": "Gegenseite",
@@ -100,8 +100,8 @@
     "failed_asset": "Fehlgeschlagene Speichervorgang!",
     "failed_refresh": "Aktualisierung der Datenbestände fehlgeschlagen!",
     "succ_pol": "Erfolgreich erstellte Richtlinie.",
-    "fai_pol": "Fehlgeschlagene Richtlinie",
-    "fai_fet": "Datei-Details konnten nicht abgerufen werden!"
+    "failed_create_policy": "Fehlgeschlagene Richtlinie",
+    "failed_transfer_detail_fetch": "Datei-Details konnten nicht abgerufen werden!"
   },
   "component_library": {
     "delete_title": "Bestätigung der Löschung",
@@ -118,7 +118,7 @@
     "organization": "Organisation",
     "http_param": "HTTP-Datenquellen-Parametrisierung",
     "policy_details": "Zeige Richtlinien Details",
-    "content": "Inhaltstyp",
+    "content_type": "Inhaltstyp",
     "at": "Erstellt am",
     "up_at": "Aktualisiert am",
     "oth_connector": "Gegenpart",
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index a79be9f0a..c420e0500 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -29,12 +29,12 @@
     "method_para": "Method Parameterization",
     "path": "Path",
     "params": "Query Params",
-    "add_properties": "Additional Properties",
-    "category": "Data Category",
-    "subcategory": "Data Subcategory",
-    "model": "Data Model",
-    "transport": "Transport Mode",
-    "geo_method": "Geo reference method",
+    "additional_properties": "Additional Properties",
+    "data_category": "Data Category",
+    "data_subcategory": "Data Subcategory",
+    "data_model": "Data Model",
+    "transport_mode": "Transport Mode",
+    "geo_reference_method": "Geo reference method",
     "geo_location": "Geo Location",
     "sovereign": "Sovereign",
     "frequency": "Data Update Frequency",
@@ -45,11 +45,11 @@
     "show_files": "Show Reference Files",
     "coverage": "Temporal Coverage",
     "conditions": "Conditions For Use",
-    "pol": "Policy",
+    "policy": "Policy",
     "policies": "Policies",
     "irr_pol": "Irregular Policy",
-    "policy": "Contract Policy",
-    "offer": "Contract Offer",
+    "contract_policy": "Contract Policy",
+    "contract_offer": "Contract Offer",
     "con_def": "Data Offer",
     "cons": "Constraints",
     "body": "Body",
@@ -65,9 +65,9 @@
     "providing": "Providing",
     "endpoint": "Connector Endpoint",
     "endpoint_doc": "Endpoint Documentation",
-    "content": "Content Type",
+    "content_type": "Content Type",
     "publisher": "Publisher",
-    "st_license": "Standard License",
+    "standard_license": "Standard License",
     "ad_info": "Advanced Information",
     "id": "Contract Offer ID",
     "oth_connector": "Other Connector",
@@ -100,8 +100,8 @@
     "failed_asset": "Failed saving asset!",
     "failed_refresh": "Failed refreshing asset list!",
     "succ_pol": "Successfully created policy.",
-    "fai_pol": "Failed creating Policy!",
-    "fai_fet": "Failed to fetch asset details!"
+    "failed_create_policy": "Failed creating Policy!",
+    "failed_transfer_detail_fetch": "Failed to fetch asset details!"
   },
   "component_library": {
     "delete_title": "Deletion confirmation",
@@ -118,12 +118,14 @@
     "organization": "Organization",
     "http_param": "HTTP Data Source Parameterization",
     "policy_details": "Show Policy Details",
-    "content": "Content Type",
+    "content_type": "Content Type",
     "at": "Created At",
     "up_at": "Updated At",
     "oth_connector": "Other Connector",
     "participant_id": "Participant ID",
+    "participant_id_plural": "Participant IDs",
     "connector_id": "Connector ID",
+    "connector_id_plural": "Connector IDs",
     "json_ld": "Show JSON-LD",
     "no_transfer": "No transfer processes started yet.",
     "json": "Cleaned JSON",