diff --git a/apps/demos/Demos/Diagram/OperationRestrictions/Vue/App.vue b/apps/demos/Demos/Diagram/OperationRestrictions/Vue/App.vue
index 06b0424a6c2c..5d149b93b1a0 100644
--- a/apps/demos/Demos/Diagram/OperationRestrictions/Vue/App.vue
+++ b/apps/demos/Demos/Diagram/OperationRestrictions/Vue/App.vue
@@ -65,8 +65,7 @@ import {
   DxContextToolbox,
   DxToolbox,
   DxPropertiesPanel,
-  DxGroup,
-  type DxDiagramTypes,
+  DxGroup
 } from 'devextreme-vue/diagram';
 import notify from 'devextreme/ui/notify';
 import ArrayStore from 'devextreme/data/array_store';
@@ -77,7 +76,7 @@ const orgItemsDataSource = new ArrayStore({
   data: service.getOrgItems(),
 });
 const diagram = ref();
-const shapes = ['team', 'employee'] as unknown as DxDiagramTypes.ShapeType[];
+const shapes = ['team', 'employee'];
 
 const itemStyleExpr = ({ Type }) => ({
   fill: {
diff --git a/packages/devextreme-angular/src/ui/diagram/index.ts b/packages/devextreme-angular/src/ui/diagram/index.ts
index 1b7f51a12727..550707d6dee0 100644
--- a/packages/devextreme-angular/src/ui/diagram/index.ts
+++ b/packages/devextreme-angular/src/ui/diagram/index.ts
@@ -145,10 +145,10 @@ export class DxDiagramComponent extends DxComponent implements OnDestroy, OnChan
     
      */
     @Input()
-    get contextToolbox(): { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, enabled?: boolean, shapeIconsPerRow?: number, shapes?: Array<ShapeType>, width?: number } {
+    get contextToolbox(): { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, enabled?: boolean, shapeIconsPerRow?: number, shapes?: Array<ShapeType | string>, width?: number } {
         return this._getOption('contextToolbox');
     }
-    set contextToolbox(value: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, enabled?: boolean, shapeIconsPerRow?: number, shapes?: Array<ShapeType>, width?: number }) {
+    set contextToolbox(value: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, enabled?: boolean, shapeIconsPerRow?: number, shapes?: Array<ShapeType | string>, width?: number }) {
         this._setOption('contextToolbox', value);
     }
 
@@ -483,10 +483,10 @@ export class DxDiagramComponent extends DxComponent implements OnDestroy, OnChan
     
      */
     @Input()
-    get toolbox(): { groups?: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array<ShapeType>, title?: string }[], shapeIconsPerRow?: number, showSearch?: boolean, visibility?: PanelVisibility, width?: number | undefined } {
+    get toolbox(): { groups?: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array<ShapeType | string>, title?: string }[], shapeIconsPerRow?: number, showSearch?: boolean, visibility?: PanelVisibility, width?: number | undefined } {
         return this._getOption('toolbox');
     }
-    set toolbox(value: { groups?: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array<ShapeType>, title?: string }[], shapeIconsPerRow?: number, showSearch?: boolean, visibility?: PanelVisibility, width?: number | undefined }) {
+    set toolbox(value: { groups?: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array<ShapeType | string>, title?: string }[], shapeIconsPerRow?: number, showSearch?: boolean, visibility?: PanelVisibility, width?: number | undefined }) {
         this._setOption('toolbox', value);
     }
 
@@ -680,7 +680,7 @@ export class DxDiagramComponent extends DxComponent implements OnDestroy, OnChan
      * This member supports the internal infrastructure and is not intended to be used directly from your code.
     
      */
-    @Output() contextToolboxChange: EventEmitter<{ category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, enabled?: boolean, shapeIconsPerRow?: number, shapes?: Array<ShapeType>, width?: number }>;
+    @Output() contextToolboxChange: EventEmitter<{ category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, enabled?: boolean, shapeIconsPerRow?: number, shapes?: Array<ShapeType | string>, width?: number }>;
 
     /**
     
@@ -862,7 +862,7 @@ export class DxDiagramComponent extends DxComponent implements OnDestroy, OnChan
      * This member supports the internal infrastructure and is not intended to be used directly from your code.
     
      */
-    @Output() toolboxChange: EventEmitter<{ groups?: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array<ShapeType>, title?: string }[], shapeIconsPerRow?: number, showSearch?: boolean, visibility?: PanelVisibility, width?: number | undefined }>;
+    @Output() toolboxChange: EventEmitter<{ groups?: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array<ShapeType | string>, title?: string }[], shapeIconsPerRow?: number, showSearch?: boolean, visibility?: PanelVisibility, width?: number | undefined }>;
 
     /**
     
diff --git a/packages/devextreme-angular/src/ui/diagram/nested/context-toolbox.ts b/packages/devextreme-angular/src/ui/diagram/nested/context-toolbox.ts
index 52173dcc5456..ea4bbd8f217d 100644
--- a/packages/devextreme-angular/src/ui/diagram/nested/context-toolbox.ts
+++ b/packages/devextreme-angular/src/ui/diagram/nested/context-toolbox.ts
@@ -62,10 +62,10 @@ export class DxoDiagramContextToolboxComponent extends NestedOption implements O
     }
 
     @Input()
-    get shapes(): Array<ShapeType> {
+    get shapes(): Array<ShapeType | string> {
         return this._getOption('shapes');
     }
-    set shapes(value: Array<ShapeType>) {
+    set shapes(value: Array<ShapeType | string>) {
         this._setOption('shapes', value);
     }
 
diff --git a/packages/devextreme-angular/src/ui/diagram/nested/group-dxi.ts b/packages/devextreme-angular/src/ui/diagram/nested/group-dxi.ts
index ab09bfb06dd2..9dd9590ff47b 100644
--- a/packages/devextreme-angular/src/ui/diagram/nested/group-dxi.ts
+++ b/packages/devextreme-angular/src/ui/diagram/nested/group-dxi.ts
@@ -72,10 +72,10 @@ export class DxiDiagramGroupComponent extends CollectionNestedOption {
     }
 
     @Input()
-    get shapes(): Array<ShapeType> {
+    get shapes(): Array<ShapeType | string> {
         return this._getOption('shapes');
     }
-    set shapes(value: Array<ShapeType>) {
+    set shapes(value: Array<ShapeType | string>) {
         this._setOption('shapes', value);
     }
 
diff --git a/packages/devextreme-angular/src/ui/diagram/nested/toolbox-group-dxi.ts b/packages/devextreme-angular/src/ui/diagram/nested/toolbox-group-dxi.ts
index 6aeabdf1eaf7..3c8da53a2cd5 100644
--- a/packages/devextreme-angular/src/ui/diagram/nested/toolbox-group-dxi.ts
+++ b/packages/devextreme-angular/src/ui/diagram/nested/toolbox-group-dxi.ts
@@ -52,10 +52,10 @@ export class DxiDiagramToolboxGroupComponent extends CollectionNestedOption {
     }
 
     @Input()
-    get shapes(): Array<ShapeType> {
+    get shapes(): Array<ShapeType | string> {
         return this._getOption('shapes');
     }
-    set shapes(value: Array<ShapeType>) {
+    set shapes(value: Array<ShapeType | string>) {
         this._setOption('shapes', value);
     }
 
diff --git a/packages/devextreme-angular/src/ui/diagram/nested/toolbox.ts b/packages/devextreme-angular/src/ui/diagram/nested/toolbox.ts
index 75872bc1fd5c..fc6cd9eff37f 100644
--- a/packages/devextreme-angular/src/ui/diagram/nested/toolbox.ts
+++ b/packages/devextreme-angular/src/ui/diagram/nested/toolbox.ts
@@ -35,10 +35,10 @@ import { DxiDiagramToolboxGroupComponent } from './toolbox-group-dxi';
 })
 export class DxoDiagramToolboxComponent extends NestedOption implements OnDestroy, OnInit  {
     @Input()
-    get groups(): { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array<ShapeType>, title?: string }[] {
+    get groups(): { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array<ShapeType | string>, title?: string }[] {
         return this._getOption('groups');
     }
-    set groups(value: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array<ShapeType>, title?: string }[]) {
+    set groups(value: { category?: ShapeCategory | string, displayMode?: ToolboxDisplayMode, expanded?: boolean, shapes?: Array<ShapeType | string>, title?: string }[]) {
         this._setOption('groups', value);
     }
 
diff --git a/packages/devextreme-react/src/diagram.ts b/packages/devextreme-react/src/diagram.ts
index 7555394e7e42..9ac16e28aeb5 100644
--- a/packages/devextreme-react/src/diagram.ts
+++ b/packages/devextreme-react/src/diagram.ts
@@ -241,7 +241,7 @@ type IContextToolboxProps = React.PropsWithChildren<{
   displayMode?: ToolboxDisplayMode;
   enabled?: boolean;
   shapeIconsPerRow?: number;
-  shapes?: Array<ShapeType>;
+  shapes?: Array<ShapeType | string>;
   width?: number;
 }>
 const _componentContextToolbox = (props: IContextToolboxProps) => {
@@ -468,7 +468,7 @@ type IGroupProps = React.PropsWithChildren<{
   category?: ShapeCategory | string;
   displayMode?: ToolboxDisplayMode;
   expanded?: boolean;
-  shapes?: Array<ShapeType>;
+  shapes?: Array<ShapeType | string>;
 }>
 const _componentGroup = (props: IGroupProps) => {
   return React.createElement(NestedOption<IGroupProps>, {
@@ -745,7 +745,7 @@ type IToolboxProps = React.PropsWithChildren<{
     category?: ShapeCategory | string;
     displayMode?: ToolboxDisplayMode;
     expanded?: boolean;
-    shapes?: Array<ShapeType>;
+    shapes?: Array<ShapeType | string>;
     title?: string;
   }[];
   shapeIconsPerRow?: number;
@@ -776,7 +776,7 @@ type IToolboxGroupProps = React.PropsWithChildren<{
   category?: ShapeCategory | string;
   displayMode?: ToolboxDisplayMode;
   expanded?: boolean;
-  shapes?: Array<ShapeType>;
+  shapes?: Array<ShapeType | string>;
   title?: string;
 }>
 const _componentToolboxGroup = (props: IToolboxGroupProps) => {
diff --git a/packages/devextreme-vue/src/diagram.ts b/packages/devextreme-vue/src/diagram.ts
index e461d5058875..22a65f744f25 100644
--- a/packages/devextreme-vue/src/diagram.ts
+++ b/packages/devextreme-vue/src/diagram.ts
@@ -357,7 +357,7 @@ const DxContextToolboxConfig = {
     displayMode: String as PropType<ToolboxDisplayMode>,
     enabled: Boolean,
     shapeIconsPerRow: Number,
-    shapes: Array as PropType<Array<ShapeType>>,
+    shapes: Array as PropType<Array<ShapeType | string>>,
     width: Number
   }
 };
@@ -628,7 +628,7 @@ const DxGroupConfig = {
     commands: Array as PropType<Array<Command | CustomCommand>>,
     displayMode: String as PropType<ToolboxDisplayMode>,
     expanded: Boolean,
-    shapes: Array as PropType<Array<ShapeType>>,
+    shapes: Array as PropType<Array<ShapeType | string>>,
     title: String
   }
 };
@@ -937,7 +937,7 @@ const DxToolboxGroupConfig = {
     category: String as PropType<ShapeCategory | string>,
     displayMode: String as PropType<ToolboxDisplayMode>,
     expanded: Boolean,
-    shapes: Array as PropType<Array<ShapeType>>,
+    shapes: Array as PropType<Array<ShapeType | string>>,
     title: String
   }
 };
diff --git a/packages/devextreme/js/ui/diagram.d.ts b/packages/devextreme/js/ui/diagram.d.ts
index 91b4dfb2a94d..b5a17f3b7f4b 100644
--- a/packages/devextreme/js/ui/diagram.d.ts
+++ b/packages/devextreme/js/ui/diagram.d.ts
@@ -287,7 +287,7 @@ export interface dxDiagramOptions extends WidgetOptions<dxDiagram> {
       /**
        * @docid
        */
-      shapes?: Array<ShapeType> | Array<string>;
+      shapes?: Array<ShapeType | string>;
       /**
        * @docid
        * @default 152
@@ -1068,7 +1068,7 @@ export interface dxDiagramOptions extends WidgetOptions<dxDiagram> {
         /**
          * @docid
          */
-        shapes?: Array<ShapeType> | Array<string>;
+        shapes?: Array<ShapeType | string>;
         /**
          * @docid
          */
diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts
index 5c1da3ee8473..899215510543 100644
--- a/packages/devextreme/ts/dx.all.d.ts
+++ b/packages/devextreme/ts/dx.all.d.ts
@@ -13995,7 +13995,7 @@ declare module DevExpress.ui {
       /**
        * [descr:dxDiagramOptions.contextToolbox.shapes]
        */
-      shapes?: Array<DevExpress.ui.dxDiagram.ShapeType> | Array<string>;
+      shapes?: Array<DevExpress.ui.dxDiagram.ShapeType | string>;
       /**
        * [descr:dxDiagramOptions.contextToolbox.width]
        */
@@ -14678,7 +14678,7 @@ declare module DevExpress.ui {
             /**
              * [descr:dxDiagramOptions.toolbox.groups.shapes]
              */
-            shapes?: Array<DevExpress.ui.dxDiagram.ShapeType> | Array<string>;
+            shapes?: Array<DevExpress.ui.dxDiagram.ShapeType | string>;
             /**
              * [descr:dxDiagramOptions.toolbox.groups.title]
              */