diff --git a/apps/client/src/app/core/language.service.ts b/apps/client/src/app/core/language.service.ts
deleted file mode 100644
index 1f5ce68c8..000000000
--- a/apps/client/src/app/core/language.service.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { Service } from '@angular/core';
-
-@Service({ autoProvided: false })
-export class LanguageService {}
diff --git a/apps/client/src/app/core/layout.service.ts b/apps/client/src/app/core/layout.service.ts
index 2daa39f81..afb7161d6 100644
--- a/apps/client/src/app/core/layout.service.ts
+++ b/apps/client/src/app/core/layout.service.ts
@@ -9,7 +9,7 @@ export class LayoutService {
   public static readonly DEFAULT_NOTIFICATION_MAX_WIDTH = '50rem';
   public static readonly DEFAULT_NOTIFICATION_WIDTH = '75vw';
 
-  public shouldReloadContent$: Observable<void>;
+  public readonly shouldReloadContent$: Observable<void>;
 
   private readonly shouldReloadSubject = new Subject<void>();
 
diff --git a/apps/client/src/main.ts b/apps/client/src/main.ts
index 3e80df9c7..159c2a7c9 100644
--- a/apps/client/src/main.ts
+++ b/apps/client/src/main.ts
@@ -4,7 +4,6 @@ import { registerChartConfiguration } from '@ghostfolio/ui/chart';
 import { GF_ENVIRONMENT } from '@ghostfolio/ui/environment';
 import { GfNotificationModule } from '@ghostfolio/ui/notifications';
 
-import { Platform } from '@angular/cdk/platform';
 import {
   provideHttpClient,
   withInterceptorsFromDi
@@ -17,7 +16,6 @@ import {
 import {
   DateAdapter,
   MAT_DATE_FORMATS,
-  MAT_DATE_LOCALE,
   MatNativeDateModule
 } from '@angular/material/core';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
@@ -35,7 +33,6 @@ import { GfAppComponent } from './app/app.component';
 import { routes } from './app/app.routes';
 import { authInterceptorProviders } from './app/core/auth.interceptor';
 import { httpResponseInterceptorProviders } from './app/core/http-response.interceptor';
-import { LanguageService } from './app/core/language.service';
 import { ModulePreloadService } from './app/core/module-preload.service';
 import { PageTitleStrategy } from './app/services/page-title.strategy';
 import { environment } from './environments/environment';
@@ -44,8 +41,7 @@ import { environment } from './environments/environment';
   const response = await fetch('/api/v1/info');
   const info: InfoResponse = await response.json();
   const utmSource = window.localStorage.getItem('utm_source') as
-    | 'ios'
-    | 'trusted-web-activity';
+    'ios' | 'trusted-web-activity';
 
   info.globalPermissions = filterGlobalPermissions(
     info.globalPermissions,
@@ -79,7 +75,6 @@ import { environment } from './environments/environment';
           registrationStrategy: 'registerImmediately'
         })
       ),
-      LanguageService,
       ModulePreloadService,
       provideHttpClient(withInterceptorsFromDi()),
       provideIonicAngular(),
@@ -87,7 +82,6 @@ import { environment } from './environments/environment';
       provideNgxSkeletonLoader(),
       provideZoneChangeDetection(),
       {
-        deps: [LanguageService, MAT_DATE_LOCALE, Platform],
         provide: DateAdapter,
         useClass: CustomDateAdapter
       },
diff --git a/libs/ui/src/lib/entity-logo/entity-logo-image-source.service.ts b/libs/ui/src/lib/entity-logo/entity-logo-image-source.service.ts
index 26d2ff675..dc937e6b9 100644
--- a/libs/ui/src/lib/entity-logo/entity-logo-image-source.service.ts
+++ b/libs/ui/src/lib/entity-logo/entity-logo-image-source.service.ts
@@ -2,7 +2,8 @@ import { AssetProfileIdentifier } from '@ghostfolio/common/interfaces';
 
 import { Service } from '@angular/core';
 
-// Must stay auto-provided so it can be mocked in Storybook
+// Must stay auto-provided: several table stories render gf-entity-logo
+// without providing an override and resolve this from the root injector
 @Service()
 export class EntityLogoImageSourceService {
   public getLogoUrlByAssetProfileIdentifier({