diff --git a/npm/ng-packs/packages/core/src/lib/services/lazy-load.service.ts b/npm/ng-packs/packages/core/src/lib/services/lazy-load.service.ts
index a9d1f53429..0cdf546ff0 100644
--- a/npm/ng-packs/packages/core/src/lib/services/lazy-load.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/lazy-load.service.ts
@@ -30,7 +30,9 @@ export class LazyLoadService {
         const key = url ? url.slice(url.lastIndexOf('/') + 1) : uuid();
 
         if (this.loadedLibraries[key]) {
-          return this.loadedLibraries[key].asObservable();
+          subscriber.next();
+          subscriber.complete();
+          return;
         }
 
         this.loadedLibraries[key] = new ReplaySubject();
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts
index 214f2e52de..59c6b3c13d 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts
@@ -3,7 +3,7 @@ import { Component, Input } from '@angular/core';
 @Component({
   selector: 'abp-button',
   template: `
-    <button [attr.type]="buttonType || type" [ngClass]="buttonClass" [disabled]="loading || disabled">
+    <button [attr.type]="type" [ngClass]="buttonClass" [disabled]="loading || disabled">
       <i [ngClass]="icon" class="mr-1"></i><ng-content></ng-content>
     </button>
   `,
@@ -13,7 +13,7 @@ export class ButtonComponent {
   buttonClass = 'btn btn-primary';
 
   @Input()
-  buttonType = 'button';
+  buttonType; // TODO: Add initial value.
 
   @Input()
   iconClass: string;
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts b/npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts
index c7fa014373..a53bd4573b 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts
@@ -38,7 +38,7 @@ export default `
   left: 0 !important;
   width: 100% !important;
   height: 100% !important;
-  background-color: rgba(0, 0, 0, .6) !important;
+  background-color: rgba(0, 0, 0, 0.6) !important;
   z-index: 1040 !important;
 }
 
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
index a1839f6217..b4348ca897 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
@@ -32,9 +32,9 @@ export function appendScript(injector: Injector) {
         'style',
         styles,
         'head',
-        'afterbegin'
-      ) /* lazyLoadService.load(null, 'script', scripts) */
-    ).pipe(take(1));
+        'afterbegin',
+      ) /* lazyLoadService.load(null, 'script', scripts) */,
+    ).toPromise();
   };
 
   return fn;
@@ -53,7 +53,7 @@ export function appendScript(injector: Injector) {
     ModalComponent,
     ProfileComponent,
     TableEmptyMessageComponent,
-    ToastComponent
+    ToastComponent,
   ],
   exports: [
     BreadcrumbComponent,
@@ -65,9 +65,9 @@ export function appendScript(injector: Injector) {
     ModalComponent,
     ProfileComponent,
     TableEmptyMessageComponent,
-    ToastComponent
+    ToastComponent,
   ],
-  entryComponents: [ErrorComponent]
+  entryComponents: [ErrorComponent],
 })
 export class ThemeSharedModule {
   static forRoot(): ModuleWithProviders {
@@ -78,10 +78,10 @@ export class ThemeSharedModule {
           provide: APP_INITIALIZER,
           multi: true,
           deps: [Injector, ErrorHandler],
-          useFactory: appendScript
+          useFactory: appendScript,
         },
-        { provide: MessageService, useClass: MessageService }
-      ]
+        { provide: MessageService, useClass: MessageService },
+      ],
     };
   }
 }