diff --git a/packages/editor/src/components/action-widget/pane/icon-picker/image-icon-tab/iconGroups.json b/packages/editor/src/components/action-widget/pane/icon-picker/image-icon-tab/iconGroups.json
index 6806960c..e988b845 100644
--- a/packages/editor/src/components/action-widget/pane/icon-picker/image-icon-tab/iconGroups.json
+++ b/packages/editor/src/components/action-widget/pane/icon-picker/image-icon-tab/iconGroups.json
@@ -26,15 +26,13 @@
             "things_pin",
             "things_window-layout",
             "things_bubbles",
-            "object_clanbomber",
             "object_key",
             "object_pencil",
             "object_magnifier",
             "object_clip",
             "object_music",
             "object_star",
-            "object_house",
-            "object_camera"
+            "object_house"
         ]
     },
     {
@@ -113,6 +111,7 @@
             "tag_red",
             "tag_pink",
             "tag_yellow",
+
             "task_0",
             "task_25",
             "task_50",
diff --git a/packages/mindplot/assets/icons/object_camera.svg b/packages/mindplot/assets/icons/object_camera.svg
deleted file mode 100644
index bee0ef4a..00000000
--- a/packages/mindplot/assets/icons/object_camera.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="translate(0 -1028.4)">
-  <path d="m2 1034.4c-1.1046 0-2 0.9-2 2v2 8 2c0 1.1 0.89543 2 2 2h16 4c1.105 0 2-0.9 2-2v-10-2c0-1.1-0.895-2-2-2h-4-12-4z" fill="#c0392b"/>
-  <path d="m2 1031.4c-1.1046 0-2 0.9-2 2v2 8 2c0 1.1 0.89543 2 2 2h16 4c1.105 0 2-0.9 2-2v-10-2c0-1.1-0.895-2-2-2h-4-12-4z" fill="#c0392b"/>
-  <path d="m2 1033.4c-1.1046 0-2 0.9-2 2v2 8 2c0 1.1 0.89543 2 2 2h16 4c1.105 0 2-0.9 2-2v-10-2c0-1.1-0.895-2-2-2h-4-12-4z" fill="#e74c3c"/>
-  <path d="m17 13c0 3.314-2.686 6-6 6-3.3137 0-6-2.686-6-6 0-3.3137 2.6863-6 6-6 3.314 0 6 2.6863 6 6z" transform="translate(1 1029.4)" fill="#c0392b"/>
-  <path d="m17 13c0 3.314-2.686 6-6 6-3.3137 0-6-2.686-6-6 0-3.3137 2.6863-6 6-6 3.314 0 6 2.6863 6 6z" transform="translate(1 1028.4)" fill="#ecf0f1"/>
-  <path d="m15 12.5c0 1.933-1.343 3.5-3 3.5s-3-1.567-3-3.5 1.343-3.5 3-3.5 3 1.567 3 3.5z" transform="matrix(1.3333 0 0 1.1429 -4 1027.1)" fill="#34495e"/>
-  <path d="m15 12.5c0 1.933-1.343 3.5-3 3.5s-3-1.567-3-3.5 1.343-3.5 3-3.5 3 1.567 3 3.5z" transform="matrix(1 0 0 .85714 0 1030.6)" fill="#2c3e50"/>
-  <path d="m14 13c0 1.105-0.895 2-2 2s-2-0.895-2-2 0.895-2 2-2 2 0.895 2 2z" transform="translate(0 1028.4)" fill="#34495e"/>
-  <path d="m13 13c0 0.552-0.448 1-1 1s-1-0.448-1-1 0.448-1 1-1 1 0.448 1 1z" transform="translate(0 1028.4)" fill="#3498db"/>
-  <path d="m25 12.5c0 0.828-0.672 1.5-1.5 1.5s-1.5-0.672-1.5-1.5 0.672-1.5 1.5-1.5 1.5 0.672 1.5 1.5z" transform="matrix(.66667 0 0 .66666 -4.6667 1031)" fill="#ecf0f1"/>
-  <rect height="1" width="3" y="1036.4" x="19" fill="#ecf0f1"/>
-  <rect height="1" width="3" y="1035.4" x="19" fill="#c0392b"/>
-  <path d="m4 2c-1.1046 0-2 0.8954-2 2h2 3 2c0-1.1046-0.8954-2-2-2h-3z" transform="translate(0 1028.4)" fill="#c0392b"/>
- </g>
-</svg>
diff --git a/packages/mindplot/assets/icons/object_clanbomber.svg b/packages/mindplot/assets/icons/object_clanbomber.svg
deleted file mode 100644
index 836fe2d9..00000000
--- a/packages/mindplot/assets/icons/object_clanbomber.svg
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<path style="fill:#F5DCB4;" d="M426.667,89.825h-71.86c-19.815,0-35.93-16.118-35.93-35.93C318.877,24.175,294.702,0,264.983,0
-	s-53.895,24.175-53.895,53.895v35.93h17.965v-35.93c0-19.812,16.115-35.93,35.93-35.93s35.93,16.118,35.93,35.93
-	c0,29.72,24.175,53.895,53.895,53.895h71.86c4.965,0,8.982-4.022,8.982-8.982C435.649,93.847,431.631,89.825,426.667,89.825z"/>
-<path style="fill:#FFDC64;" d="M426.667,71.86c-4.965,0-8.982-4.022-8.982-8.982V44.912c0-4.961,4.017-8.982,8.982-8.982
-	s8.982,4.022,8.982,8.982v17.965C435.649,67.838,431.631,71.86,426.667,71.86z"/>
-<path style="fill:#FFF082;" d="M401.263,82.382c-2.298,0-4.597-0.877-6.351-2.632l-12.701-12.701c-3.509-3.509-3.509-9.192,0-12.701
-	c3.509-3.509,9.192-3.509,12.701,0l12.702,12.701c3.509,3.509,3.509,9.192,0,12.701C405.859,81.505,403.562,82.382,401.263,82.382z"
-	/>
-<g>
-	<rect x="211.088" y="71.86" style="fill:#EBC9A0;" width="17.965" height="17.965"/>
-	<path style="fill:#EBC9A0;" d="M400.113,107.79h-17.185V89.825h17.185V107.79z M365.736,107.79h-10.929
-		c-2.544,0-5.027-0.175-7.464-0.509l2.457-17.799c1.63,0.228,3.306,0.342,5.008,0.342h10.929V107.79z M327.938,100.627
-		c-6-3.456-11.21-7.965-15.491-13.403l14.105-11.114c2.869,3.631,6.351,6.645,10.351,8.957L327.938,100.627z M303.043,68.982
-		c-1.412-4.89-2.131-9.965-2.131-15.087c-0.009-1.162-0.062-2.368-0.175-3.553l17.877-1.728c0.166,1.719,0.255,3.46,0.263,5.228
-		c0,3.483,0.483,6.877,1.429,10.14L303.043,68.982z M211.088,54.671v-0.776c0-6.631,1.194-13.11,3.535-19.254l16.789,6.412
-		c-1.57,4.092-2.359,8.412-2.359,12.842L211.088,54.671z M296.851,37.276c-2.149-4.093-5.009-7.693-8.527-10.697l11.684-13.649
-		c5.255,4.496,9.544,9.886,12.754,16.013L296.851,37.276z M238.631,29.465l-13.158-12.228c4.71-5.075,10.264-9.145,16.509-12.096
-		l7.684,16.237C245.5,23.351,241.79,26.071,238.631,29.465z M276.456,19.833c-4.36-1.465-9-2.079-13.57-1.807l-1-17.939
-		c6.824-0.391,13.772,0.527,20.289,2.71L276.456,19.833z"/>
-	<path style="fill:#EBC9A0;" d="M426.667,107.79h-8.982V89.825h8.982c4.961,0,8.982,4.022,8.982,8.982l0,0
-		C435.649,103.768,431.627,107.79,426.667,107.79z"/>
-</g>
-<path style="fill:#464655;" d="M256,80.842h-71.86c-4.961,0-8.982,4.022-8.982,8.982v40.421h89.825V89.825
-	C264.983,84.863,260.961,80.842,256,80.842z"/>
-<circle style="fill:#5B5D6E;" cx="220.07" cy="314.386" r="197.614"/>
-<path style="fill:#464655;" d="M286.69,445.379c-109.139,0-197.614-88.475-197.614-197.614c0-37.495,10.443-72.549,28.578-102.416
-	c-57.07,34.652-95.197,97.391-95.197,169.036C22.456,423.525,110.931,512,220.07,512c71.645,0,134.383-38.127,169.036-95.198
-	C359.239,434.936,324.185,445.379,286.69,445.379z"/>
-<g>
-	<path style="fill:#FFDC64;" d="M480.561,107.79h-17.965c-4.965,0-8.982-4.022-8.982-8.982c0-4.961,4.017-8.982,8.982-8.982h17.965
-		c4.965,0,8.982,4.022,8.982,8.982C489.544,103.768,485.525,107.79,480.561,107.79z"/>
-	<path style="fill:#FFDC64;" d="M426.667,161.684c-4.965,0-8.982-4.022-8.982-8.982v-17.965c0-4.961,4.017-8.982,8.982-8.982
-		s8.982,4.022,8.982,8.982v17.965C435.649,157.662,431.631,161.684,426.667,161.684z"/>
-</g>
-<g>
-	<path style="fill:#FFF082;" d="M464.771,145.899c-2.298,0-4.597-0.877-6.351-2.632l-12.702-12.701
-		c-3.509-3.509-3.509-9.192,0-12.701c3.509-3.509,9.194-3.509,12.702,0l12.701,12.701c3.509,3.509,3.509,9.192,0,12.701
-		C469.368,145.022,467.07,145.899,464.771,145.899z"/>
-	<path style="fill:#FFF082;" d="M388.561,145.899c-2.298,0-4.597-0.877-6.351-2.632c-3.509-3.509-3.509-9.192,0-12.701
-		l12.701-12.701c3.509-3.509,9.194-3.509,12.702,0c3.509,3.509,3.509,9.192,0,12.701l-12.702,12.701
-		C393.158,145.022,390.859,145.899,388.561,145.899z"/>
-	<path style="fill:#FFF082;" d="M452.07,82.382c-2.298,0-4.597-0.877-6.351-2.632c-3.509-3.509-3.509-9.192,0-12.701l12.702-12.701
-		c3.509-3.509,9.192-3.509,12.701,0c3.509,3.509,3.509,9.192,0,12.701L458.422,79.75C456.666,81.505,454.367,82.382,452.07,82.382z"
-		/>
-</g>
-<g>
-	<path style="fill:#707487;" d="M297.579,183.688c-1.825,0-3.667-0.444-5.386-1.378c-3.798-2.083-7.728-4.013-11.667-5.745
-		c-5.685-2.492-8.263-9.114-5.772-14.79c2.483-5.667,9.105-8.267,14.79-5.772c4.544,1.991,9.061,4.215,13.439,6.605
-		c5.439,2.978,7.43,9.802,4.456,15.241C305.395,181.579,301.543,183.688,297.579,183.688z"/>
-	<path style="fill:#707487;" d="M371.983,270.127c-4.579,0-8.886-2.825-10.544-7.377c-8.149-22.293-21.729-42.653-39.263-58.877
-		c-4.553-4.211-4.834-11.311-0.623-15.864c4.228-4.553,11.325-4.829,15.869-0.619c20.149,18.632,35.746,42.022,45.105,67.649
-		c2.131,5.825-0.868,12.272-6.693,14.403C374.561,269.904,373.263,270.127,371.983,270.127z"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/packages/mindplot/assets/icons/task_0.svg b/packages/mindplot/assets/icons/task_0.svg
new file mode 100644
index 00000000..d8356fe4
--- /dev/null
+++ b/packages/mindplot/assets/icons/task_0.svg
@@ -0,0 +1,8 @@
+<svg width="48" height="48" xmlns="http://www.w3.org/2000/svg" fill="none">
+
+ <g>
+  <title>Layer 1</title>
+  <rect id="svg_1" fill-opacity="0.01" fill="white" height="48" width="48"/>
+  <circle id="svg_2" stroke-linejoin="round" stroke-linecap="round" stroke-width="4" stroke="black" r="20" cy="24" cx="24"/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/packages/mindplot/assets/icons/task_100.svg b/packages/mindplot/assets/icons/task_100.svg
new file mode 100644
index 00000000..129f0af8
--- /dev/null
+++ b/packages/mindplot/assets/icons/task_100.svg
@@ -0,0 +1,5 @@
+<svg width="48px" height="48px" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="48" height="48" fill="white" fill-opacity="0.01"/>
+<circle cx="24" cy="24" r="20" stroke="black" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M24 4C28.6001 4 33.0597 5.58577 36.6271 8.49009C40.1944 11.3944 42.6516 15.4397 43.5845 19.9443C44.5173 24.4488 43.8688 29.1373 41.7483 33.2195C39.6277 37.3017 36.1648 40.5282 31.943 42.3551C27.7212 44.182 22.9986 44.4978 18.5712 43.2491C14.1438 42.0004 10.2821 39.2637 7.637 35.5001C4.9919 31.7365 3.72505 27.1761 4.04994 22.5875C4.37484 17.9988 6.27162 13.6624 9.42063 10.3091L24 24V4Z" fill="#2F88FF" stroke="black" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/mindplot/assets/icons/task_25.svg b/packages/mindplot/assets/icons/task_25.svg
new file mode 100644
index 00000000..13dabee9
--- /dev/null
+++ b/packages/mindplot/assets/icons/task_25.svg
@@ -0,0 +1,5 @@
+<svg width="48px" height="48px" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="48" height="48" fill="white" fill-opacity="0.01"/>
+<circle cx="24" cy="24" r="20" stroke="black" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M24 4C26.6264 4 29.2272 4.51732 31.6537 5.52241C34.0802 6.5275 36.285 8.00069 38.1421 9.85787C39.9993 11.715 41.4725 13.9198 42.4776 16.3463C43.4827 18.7728 44 21.3736 44 24L24 24V4Z" fill="#2F88FF" stroke="black" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/mindplot/assets/icons/task_50.svg b/packages/mindplot/assets/icons/task_50.svg
new file mode 100644
index 00000000..a18ceb04
--- /dev/null
+++ b/packages/mindplot/assets/icons/task_50.svg
@@ -0,0 +1,5 @@
+<svg width="48px" height="48px" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="48" height="48" fill="white" fill-opacity="0.01"/>
+<circle cx="24" cy="24" r="20" stroke="black" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M24 4C26.6264 4 29.2272 4.51732 31.6537 5.52241C34.0802 6.5275 36.285 8.00069 38.1421 9.85787C39.9993 11.715 41.4725 13.9198 42.4776 16.3463C43.4827 18.7728 44 21.3736 44 24C44 26.6264 43.4827 29.2272 42.4776 31.6537C41.4725 34.0802 39.9993 36.285 38.1421 38.1421C36.285 39.9993 34.0802 41.4725 31.6537 42.4776C29.2271 43.4827 26.6264 44 24 44L24 24V4Z" fill="#2F88FF" stroke="black" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/mindplot/assets/icons/task_75.svg b/packages/mindplot/assets/icons/task_75.svg
new file mode 100644
index 00000000..a279e956
--- /dev/null
+++ b/packages/mindplot/assets/icons/task_75.svg
@@ -0,0 +1,5 @@
+<svg width="48px" height="48px" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="48" height="48" fill="white" fill-opacity="0.01"/>
+<circle cx="24" cy="24" r="20" stroke="black" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M24 4C27.9556 4 31.8224 5.17298 35.1114 7.37061C38.4004 9.56824 40.9638 12.6918 42.4776 16.3463C43.9913 20.0009 44.3874 24.0222 43.6157 27.9018C42.844 31.7814 40.9392 35.3451 38.1421 38.1421C35.3451 40.9392 31.7814 42.844 27.9018 43.6157C24.0222 44.3874 20.0009 43.9913 16.3463 42.4776C12.6918 40.9638 9.56824 38.4004 7.37061 35.1114C5.17298 31.8224 4 27.9556 4 24H24V4Z" fill="#2F88FF" stroke="black" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/mindplot/src/components/model/SvgIconFamily.json b/packages/mindplot/src/components/model/SvgIconFamily.json
index 0f1a89d7..e6c56968 100644
--- a/packages/mindplot/src/components/model/SvgIconFamily.json
+++ b/packages/mindplot/src/components/model/SvgIconFamily.json
@@ -188,15 +188,13 @@
     {
         "id": "object",
         "icons": [
-            "object_clanbomber",
             "object_key",
             "object_pencil",
             "object_magnifier",
             "object_clip",
             "object_music",
             "object_star",
-            "object_house",
-            "object_camera"
+            "object_house"
         ]
     },
     {
diff --git a/packages/mindplot/src/components/persistence/iconToEmoji.json b/packages/mindplot/src/components/persistence/iconToEmoji.json
index 3f8babc6..5b8d162e 100644
--- a/packages/mindplot/src/components/persistence/iconToEmoji.json
+++ b/packages/mindplot/src/components/persistence/iconToEmoji.json
@@ -47,6 +47,7 @@
     "object_phone": "☎️",
     "object_cake": "🎂",
     "object_wizard": "🪄",
-    "object_bell": "🔔"
-    
+    "object_bell": "🔔",
+    "object_clanbomber": "💣",
+    "object_camera": "📷"
 }
\ No newline at end of file