diff --git a/src/@fuse/components/navigation/navigation.module.ts b/src/@fuse/components/navigation/navigation.module.ts
index dd9927b7..12519314 100644
--- a/src/@fuse/components/navigation/navigation.module.ts
+++ b/src/@fuse/components/navigation/navigation.module.ts
@@ -3,6 +3,8 @@ import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
 import { MatIconModule, MatRippleModule } from '@angular/material';
 
+import { TranslateModule } from '@ngx-translate/core';
+
 import { FuseNavigationComponent } from './navigation.component';
 import { FuseNavVerticalItemComponent } from './vertical/nav-item/nav-vertical-item.component';
 import { FuseNavVerticalCollapseComponent } from './vertical/nav-collapse/nav-vertical-collapse.component';
@@ -17,6 +19,8 @@ import { FuseNavHorizontalCollapseComponent } from './horizontal/nav-collapse/na
 
         MatIconModule,
         MatRippleModule,
+
+        TranslateModule.forChild()
     ],
     exports     : [
         FuseNavigationComponent
diff --git a/src/@fuse/services/translation-loader.service.ts b/src/@fuse/services/translation-loader.service.ts
index 27283713..83bfb448 100644
--- a/src/@fuse/services/translation-loader.service.ts
+++ b/src/@fuse/services/translation-loader.service.ts
@@ -12,6 +12,7 @@ export class FuseTranslationLoaderService
 {
     constructor(private translate: TranslateService)
     {
+        console.log('...FuseTranslationLoaderService constructor...');
     }
 
     public loadTranslations(...args: Locale[]): void
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 95a88441..9a7d71d2 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -16,10 +16,10 @@ import { locale as navigationTurkish } from './navigation/i18n/tr';
 export class AppComponent
 {
     constructor(
+        private translate: TranslateService,
         private fuseNavigationService: FuseNavigationService,
         private fuseSplashScreen: FuseSplashScreenService,
-        private translate: TranslateService,
-        private translationLoader: FuseTranslationLoaderService
+        private fuseTranslationLoader: FuseTranslationLoaderService
     )
     {
         // Add languages
@@ -28,10 +28,10 @@ export class AppComponent
         // Set the default language
         this.translate.setDefaultLang('en');
 
+        // Set the navigation translations
+        this.fuseTranslationLoader.loadTranslations(navigationEnglish, navigationTurkish);
+
         // Use a language
         this.translate.use('en');
-
-        // Set the navigation translations
-        this.translationLoader.loadTranslations(navigationEnglish, navigationTurkish);
     }
 }
diff --git a/src/app/main/content/apps/calendar/calendar.component.scss b/src/app/main/content/apps/calendar/calendar.component.scss
index 91809629..7ec51633 100644
--- a/src/app/main/content/apps/calendar/calendar.component.scss
+++ b/src/app/main/content/apps/calendar/calendar.component.scss
@@ -180,6 +180,14 @@
             }
         }
     }
+
+    .cal-hour-segment {
+
+        &:after,
+        &::after {
+            content: '' !important;
+        }
+    }
 }
 
 #calendar {
diff --git a/src/app/main/content/apps/mail/mail.component.ts b/src/app/main/content/apps/mail/mail.component.ts
index d9abe16f..0a9fa26a 100644
--- a/src/app/main/content/apps/mail/mail.component.ts
+++ b/src/app/main/content/apps/mail/mail.component.ts
@@ -34,11 +34,11 @@ export class FuseMailComponent implements OnInit, OnDestroy
 
     constructor(
         private mailService: MailService,
-        private translationLoader: FuseTranslationLoaderService
+        private fuseTranslationLoader: FuseTranslationLoaderService
     )
     {
         this.searchInput = new FormControl('');
-        this.translationLoader.loadTranslations(english, turkish);
+        this.fuseTranslationLoader.loadTranslations(english, turkish);
     }
 
     ngOnInit()