diff --git a/goofy-client/libs/navigation/src/lib/header-container/header/header.component.spec.ts b/goofy-client/libs/navigation/src/lib/header-container/header/header.component.spec.ts
index 57d8e2876306947723e0ae19f80ab0469bb9d702..6412f14e797b9253b5b565b041a5528871b84d00 100644
--- a/goofy-client/libs/navigation/src/lib/header-container/header/header.component.spec.ts
+++ b/goofy-client/libs/navigation/src/lib/header-container/header/header.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { UiModule } from '@goofy-client/ui';
+import { UserIconComponent } from '@goofy-client/user-profile';
 import { VorgangSearchContainerComponent } from '@goofy-client/vorgang-shared-ui';
 import { configureTestSuite } from 'ng-bullet';
 import { MockComponent } from 'ng-mocks';
@@ -20,7 +21,8 @@ describe('HeaderComponent', () => {
 			declarations: [
 				HeaderComponent,
 				MockComponent(SettingsComponent),
-				MockComponent(VorgangSearchContainerComponent)
+				MockComponent(VorgangSearchContainerComponent),
+				MockComponent(UserIconComponent)
 			]
 		})
 	});
diff --git a/goofy-client/libs/navigation/src/lib/navigation.module.ts b/goofy-client/libs/navigation/src/lib/navigation.module.ts
index f43a7c0399752d09f9ef3cae8791b85d4e0c9ef1..87467d3c79bb485401dda82cf4295abcf6b21789 100644
--- a/goofy-client/libs/navigation/src/lib/navigation.module.ts
+++ b/goofy-client/libs/navigation/src/lib/navigation.module.ts
@@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { UiModule } from '@goofy-client/ui';
+import { UserProfileModule } from '@goofy-client/user-profile';
 import { VorgangSharedUiModule } from '@goofy-client/vorgang-shared-ui';
 import { BuildInfoComponent } from './build-info/build-info.component';
 import { HeaderContainerComponent } from './header-container/header-container.component';
@@ -21,7 +22,8 @@ import { NavigationComponent } from './navigation/navigation.component';
 		CommonModule,
 		UiModule,
 		RouterModule,
-		VorgangSharedUiModule
+		VorgangSharedUiModule,
+		UserProfileModule
 	],
 	exports: [
 		BuildInfoComponent,
diff --git a/goofy-client/libs/ui/src/lib/ui/ui.module.ts b/goofy-client/libs/ui/src/lib/ui/ui.module.ts
index 309772e8e13755297cad40cd9516b332445d9c48..7c86b775c8f29f70037d926b33b2292f65b2f7aa 100644
--- a/goofy-client/libs/ui/src/lib/ui/ui.module.ts
+++ b/goofy-client/libs/ui/src/lib/ui/ui.module.ts
@@ -28,13 +28,11 @@ import { SpinnerComponent } from './spinner/spinner.component';
 import { SubnavigationComponent } from './subnavigation/subnavigation.component';
 import { TextEditorComponent } from './text-editor/text-editor.component';
 import { TextAreaEditorComponent } from './textarea-editor/textarea-editor.component';
-import { UserIconComponent } from './user-icon/user-icon.component';
 import { ValidationErrorComponent } from './validation-error/validation-error.component';
 
 const components = [
 	SubnavigationComponent,
 	SpinnerComponent,
-	UserIconComponent,
 	ButtonWithSpinnerComponent,
 	IconButtonWithSpinnerComponent,
 	ProgressBarComponent,
@@ -44,10 +42,10 @@ const components = [
 	DateEditorComponent,
 	TextEditorComponent,
 	TextAreaEditorComponent,
-	ValidationErrorComponent, 
+	ValidationErrorComponent,
 	PasswordEditorComponent
 ];
-	
+
 const modules = [
 	MatButtonModule,
 	MatIconModule,
@@ -77,7 +75,7 @@ const modules = [
 		TechSharedModule
 	],
 	exports: [
-		...modules, 
+		...modules,
 		...components
 	]
 })
diff --git a/goofy-client/libs/user-profile/src/index.ts b/goofy-client/libs/user-profile/src/index.ts
index b972a8136e662193724431a9a98c3c288de2b60b..9c73fd85e2a578e255f75fb91fc6af2f099bea83 100644
--- a/goofy-client/libs/user-profile/src/index.ts
+++ b/goofy-client/libs/user-profile/src/index.ts
@@ -1 +1,2 @@
+export * from './lib/user-icon/user-icon.component';
 export * from './lib/user-profile.module';
diff --git a/goofy-client/libs/user-profile/src/lib/user-profile.module.ts b/goofy-client/libs/user-profile/src/lib/user-profile.module.ts
index 8316ecf0b955c12759f93be29e738859a3b27418..e1d419e0c39de3d65877a66338d3b1cb4f8527a6 100644
--- a/goofy-client/libs/user-profile/src/lib/user-profile.module.ts
+++ b/goofy-client/libs/user-profile/src/lib/user-profile.module.ts
@@ -1,7 +1,16 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { TechSharedModule } from '@goofy-client/tech-shared';
+import { UiModule } from '@goofy-client/ui';
+import { UserIconComponent } from './user-icon/user-icon.component';
 
 @NgModule({
-  imports: [CommonModule],
+	imports: [
+		CommonModule,
+		TechSharedModule,
+		UiModule
+	],
+	declarations: [UserIconComponent],
+	exports: [UserIconComponent]
 })
-export class UserProfileModule {}
+export class UserProfileModule { }
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.spec.ts b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.spec.ts
index 5e04ee01277e8b9dea01d4f1d99107c15977097c..3f9e8919eaaed2ce0a3a05f1acb22e5ca25731f4 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.spec.ts
+++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.spec.ts
@@ -1,8 +1,8 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { EnumToLabelPipe, HasLinkPipe } from '@goofy-client/tech-shared';
+import { UserIconComponent } from '@goofy-client/user-profile';
 import { VorgangHeaderLinkRel } from '@goofy-client/vorgang-shared';
 import { AktenzeichenComponent, StatusDotComponent } from '@goofy-client/vorgang-shared-ui';
-import { UserIconComponent } from 'libs/ui/src/lib/ui/user-icon/user-icon.component';
 import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
 import { MockComponent } from 'ng-mocks';
 import { VorgangDetailHeaderComponent } from './vorgang-detail-header.component';
diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index a8ecc794e0e2dcd204b21c35ee5ee1e351908d07..23180ac69b4c09cce2ed206ff79178c423edc297 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -6,6 +6,7 @@ import { KommentarModule } from '@goofy-client/kommentar';
 import { OzgFileModule } from '@goofy-client/ozg-file';
 import { TechSharedModule } from '@goofy-client/tech-shared';
 import { UiModule } from '@goofy-client/ui';
+import { UserProfileModule } from '@goofy-client/user-profile';
 import { VorgangSharedModule } from '@goofy-client/vorgang-shared';
 import { VorgangSharedUiModule } from '@goofy-client/vorgang-shared-ui';
 import { WiedervorlageModule } from '@goofy-client/wiedervorlage';
@@ -30,8 +31,7 @@ import { VorgangDetailPageComponent } from './vorgang-detail-page/vorgang-detail
 const routes: Routes = [
 	{
 		path: '',
-		component: VorgangDetailPageComponent,
-		//children: kommentareRoutes
+		component: VorgangDetailPageComponent
 	}
 ];
 
@@ -46,7 +46,8 @@ const routes: Routes = [
 		OzgFileModule,
 		ForwardingModule,
 		KommentarModule,
-		VorgangSharedUiModule
+		VorgangSharedUiModule,
+		UserProfileModule
 	],
 	declarations: [
 		VorgangDetailPageComponent,
@@ -68,4 +69,4 @@ const routes: Routes = [
 		WiedereroeffnenButtonComponent
 	]
 })
-export class VorgangDetailModule {}
+export class VorgangDetailModule { }
diff --git a/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.spec.ts b/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.spec.ts
index a5c171aff8044a20d407c3dc022b4cb2da365b0b..8a1b07832f37e4342c0d5131064b3656f47ce707 100644
--- a/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.spec.ts
+++ b/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.spec.ts
@@ -8,14 +8,12 @@ import { MatIcon } from '@angular/material/icon';
 import { MatIconTestingModule } from '@angular/material/icon/testing';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { RouterTestingModule } from '@angular/router/testing';
-import { EnumToLabelPipe, HasLinkPipe, ToResourceUriPipe } from '@goofy-client/tech-shared';
+import { EnumToLabelPipe, FormatDateWithTimePipe, FormatListDatePipe, HasLinkPipe, ToResourceUriPipe } from '@goofy-client/tech-shared';
+import { UserIconComponent } from '@goofy-client/user-profile';
 import { VorgangHeaderLinkRel } from '@goofy-client/vorgang-shared';
 import { AktenzeichenComponent, StatusDotComponent } from '@goofy-client/vorgang-shared-ui';
-import { FormatDateWithTimePipe } from 'libs/tech-shared/src/lib/pipes/format-date-with-time.pipe';
-import { FormatListDatePipe } from 'libs/tech-shared/src/lib/pipes/format-list-date.pipe';
-import { UserIconComponent } from 'libs/ui/src/lib/ui/user-icon/user-icon.component';
+import { WiedervorlageListInVorgangListContainerComponent } from '@goofy-client/wiedervorlage';
 import { createVorgangResource } from 'libs/vorgang-shared/test/vorgang';
-import { WiedervorlageListInVorgangListContainerComponent } from 'libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-list-container/wiedervorlage-list-in-vorgang-list-container.component';
 import { configureTestSuite } from 'ng-bullet';
 import { MockComponent } from 'ng-mocks';
 import { VorgangListItemComponent } from './vorgang-list-item.component';
diff --git a/goofy-client/libs/vorgang/src/lib/vorgang.module.ts b/goofy-client/libs/vorgang/src/lib/vorgang.module.ts
index 955d2f83a5ddad6e91921592772545804b720eb5..f6ef013df728b080cea92bf49bd839cb13a139dc 100644
--- a/goofy-client/libs/vorgang/src/lib/vorgang.module.ts
+++ b/goofy-client/libs/vorgang/src/lib/vorgang.module.ts
@@ -4,6 +4,7 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { TechSharedModule } from '@goofy-client/tech-shared';
 import { UiModule } from '@goofy-client/ui';
+import { UserProfileModule } from '@goofy-client/user-profile';
 import { VorgangSharedModule } from '@goofy-client/vorgang-shared';
 import { VorgangSharedUiModule } from '@goofy-client/vorgang-shared-ui';
 import { WiedervorlageModule } from '@goofy-client/wiedervorlage';
@@ -39,6 +40,7 @@ const routes: Routes = [
 		VorgangSharedModule,
 		WiedervorlageModule,
 		VorgangSharedUiModule,
+		UserProfileModule
 	],
 	declarations: [
 		VorgangListComponent,
diff --git a/goofy-client/libs/wiedervorlage/src/index.ts b/goofy-client/libs/wiedervorlage/src/index.ts
index cd3dbd6bb18d5a83693202a3d8130bc2c91e8bd1..62fa18f0c270808454b1875293e8583dd34642be 100644
--- a/goofy-client/libs/wiedervorlage/src/index.ts
+++ b/goofy-client/libs/wiedervorlage/src/index.ts
@@ -1,5 +1,5 @@
 export * from './lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang-container.component';
 export * from './lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-in-vorgang/wiedervorlage-in-vorgang.component';
 export * from './lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-list-in-vorgang.component';
+export * from './lib/wiedervorlage-list-in-vorgang-list-container/wiedervorlage-list-in-vorgang-list-container.component';
 export * from './lib/wiedervorlage.module';
-