diff --git a/npm/ng-packs/packages/core/src/lib/core.module.ts b/npm/ng-packs/packages/core/src/lib/core.module.ts
index 238ed9bb02..81c96fdb0d 100644
--- a/npm/ng-packs/packages/core/src/lib/core.module.ts
+++ b/npm/ng-packs/packages/core/src/lib/core.module.ts
@@ -37,6 +37,7 @@ import { getInitialData, localeInitializer } from './utils/initial-utils';
 import { ShortDateTimePipe } from './pipes/short-date-time.pipe';
 import { ShortTimePipe } from './pipes/short-time.pipe';
 import { ShortDatePipe } from './pipes/short-date.pipe';
+import {PipeFunction} from "./pipes";
 
 export function storageFactory(): OAuthStorage {
   return oAuthStorage;
@@ -72,7 +73,8 @@ export function storageFactory(): OAuthStorage {
         ToInjectorPipe,
         ShortDateTimePipe,
         ShortTimePipe,
-        ShortDatePipe
+        ShortDatePipe,
+        PipeFunction
     ],
     imports: [
         OAuthModule,
@@ -100,7 +102,8 @@ export function storageFactory(): OAuthStorage {
         ToInjectorPipe,
         ShortDateTimePipe,
         ShortTimePipe,
-        ShortDatePipe
+        ShortDatePipe,
+        PipeFunction
 
     ],
     providers: [LocalizationPipe]
diff --git a/npm/ng-packs/packages/core/src/lib/pipes/index.ts b/npm/ng-packs/packages/core/src/lib/pipes/index.ts
index 71ce383cd3..7ac9f76a33 100644
--- a/npm/ng-packs/packages/core/src/lib/pipes/index.ts
+++ b/npm/ng-packs/packages/core/src/lib/pipes/index.ts
@@ -4,3 +4,4 @@ export * from './to-injector.pipe';
 export * from './short-date.pipe';
 export * from './short-time.pipe';
 export * from './short-date-time.pipe';
+export * from './pipe-function.pipe';
diff --git a/npm/ng-packs/packages/core/src/lib/pipes/pipe-function.pipe.ts b/npm/ng-packs/packages/core/src/lib/pipes/pipe-function.pipe.ts
new file mode 100644
index 0000000000..efb0f8acaa
--- /dev/null
+++ b/npm/ng-packs/packages/core/src/lib/pipes/pipe-function.pipe.ts
@@ -0,0 +1,14 @@
+import {Pipe, PipeTransform} from "@angular/core";
+
+@Pipe({
+  name: 'pipeFunction'
+})
+export class PipeFunction implements PipeTransform {
+  public transform(value: any, handler: (value: any) => any, context?: any): any {
+    if (context) {
+      return handler.call(context, value);
+    }
+
+    return handler(value);
+  }
+}
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/page-toolbar/page-toolbar.component.html b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/page-toolbar/page-toolbar.component.html
index c231f3b82c..32b4c9ba42 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/page-toolbar/page-toolbar.component.html
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/page-toolbar/page-toolbar.component.html
@@ -8,7 +8,7 @@
       <ng-container *abpPermission="action.permission">
         <ng-container *ngIf="action.component as component; else button">
           <ng-container
-            *ngComponentOutlet="component; injector: createInjector(action)"
+            *ngComponentOutlet="component; injector: action | pipeFunction: createInjector : this "
           ></ng-container>
         </ng-container>
 
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/toolbar-actions.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/toolbar-actions.ts
index 9a688cc20f..1a311d7a5d 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/toolbar-actions.ts
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/toolbar-actions.ts
@@ -68,7 +68,9 @@ export type ToolbarComponentOptions<R = any> = O.Optional<
   'permission' | 'visible' | 'action'
 >;
 
-export type ToolbarActionDefaults<R = any> = Record<string, ToolbarAction<R>[]>;
+export type ToolbarActionDefault<R = any> = ToolbarAction<R> | ToolbarComponent<R>;
+
+export type ToolbarActionDefaults<R = any> = Record<string, Array<ToolbarActionDefault<R>>>;
 export type ToolbarActionContributorCallback<R = any> = ActionContributorCallback<
   ToolbarActionList<R>
 >;