diff --git a/FloatingSpace/StrategyPartConstructor.js b/FloatingSpace/StrategyPartConstructor.js
index 92288655f..b27385f91 100644
--- a/FloatingSpace/StrategyPartConstructor.js
+++ b/FloatingSpace/StrategyPartConstructor.js
@@ -202,8 +202,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -222,7 +222,7 @@ function newStrategyPartConstructor () {
             label: 'Run',
             visible: false,
             iconPathOn: 'paper-plane',
-            iconPathOff: 'share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -294,8 +294,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -493,8 +493,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -540,8 +540,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -587,8 +587,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -634,8 +634,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -681,8 +681,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -741,8 +741,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -788,8 +788,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -835,8 +835,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -882,8 +882,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -929,8 +929,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -976,8 +976,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -1023,8 +1023,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -1070,8 +1070,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -1117,8 +1117,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -1151,8 +1151,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -1185,8 +1185,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -1232,8 +1232,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -1279,8 +1279,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -1339,8 +1339,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -1393,8 +1393,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -1440,8 +1440,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -1487,8 +1487,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -1534,8 +1534,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -1588,8 +1588,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Share',
             visible: false,
-            iconPathOn: 'share',
-            iconPathOff: 'share',
+            iconPathOn: 'menu-share',
+            iconPathOff: 'menu-share',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
diff --git a/Spaces/StrategySpace.js b/Spaces/StrategySpace.js
index c7650827d..8da55526c 100644
--- a/Spaces/StrategySpace.js
+++ b/Spaces/StrategySpace.js
@@ -49,15 +49,15 @@ function newStrategySpace () {
       ['Parameters', 'settings'],
       ['Base Asset', 'sitemap'],
       ['Strategy', 'quality'],
-      ['Trigger Stage', 'chronometer'],
+      ['Trigger Stage', 'stage-trigger'],
       ['Open Stage', 'stage-open'],
       ['Manage Stage', 'video-player'],
       ['Close Stage', 'stage-close'],
       ['Position Size', 'responsive'],
       ['Position Rate', 'promotion'],
-      ['Trigger On Event', 'startup'],
-      ['Trigger Off Event', 'support'],
-      ['Take Position Event', 'compass'],
+      ['Trigger On Event', 'stage-trigger-trigger-on'],
+      ['Trigger Off Event', 'stage-trigger-trigger-off'],
+      ['Take Position Event', 'stage-trigger-take-position'],
       ['Initial Definition', 'task'],
       ['Open Execution', 'piggy-bank'],
       ['Close Execution', 'piggy-bank'],
@@ -139,10 +139,14 @@ function newStrategySpace () {
       'menu-tree-minus',
       'menu-tree-plus',
       'menu-backup',
-      'share',
+      'menu-share',
       'stop',
       'stage-open',
-      'stage-close'
+      'stage-close',
+      'stage-trigger',
+      'stage-trigger-trigger-on',
+      'stage-trigger-trigger-off',
+      'stage-trigger-take-position'
     ]
 
     for (let i = 0; i < iconsNames.length; i++) {