diff --git a/FloatingSpace/StrategyPartConstructor.js b/FloatingSpace/StrategyPartConstructor.js
index 758c2892c..b3335ee6c 100644
--- a/FloatingSpace/StrategyPartConstructor.js
+++ b/FloatingSpace/StrategyPartConstructor.js
@@ -57,7 +57,7 @@ function newStrategyPartConstructor () {
       case 'Trading System': {
         floatingObject.isPinned = true
         floatingObject.positionLocked = true
-        strategyPart.imagePath = 'Images/icons/style-01/analysis.png'
+        strategyPart.imagePath = 'Images/Icons/style-01/analysis.png'
         menuItemsInitialValues = [
           {
             action: 'Pin / Unpin',
@@ -65,8 +65,8 @@ function newStrategyPartConstructor () {
             currentStatus: true,
             label: undefined,
             visible: false,
-            imagePathOn: 'Images/icons/style-01/target.png',
-            imagePathOff: 'Images/icons/style-01/security.png',
+            imagePathOn: 'Images/Icons/style-01/target.png',
+            imagePathOff: 'Images/Icons/style-01/security.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -77,8 +77,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Reload',
             visible: false,
-            imagePathOn: 'Images/icons/style-01/vector.png',
-            imagePathOff: 'Images/icons/style-01/vector.png',
+            imagePathOn: 'Images/Icons/style-01/vector.png',
+            imagePathOff: 'Images/Icons/style-01/vector.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -92,8 +92,8 @@ function newStrategyPartConstructor () {
             workDoneLabel: 'Saved',
             workFailedLabel: 'Not Saved',
             visible: false,
-            imagePathOn: 'Images/icons/style-01/upload.png',
-            imagePathOff: 'Images/icons/style-01/upload.png',
+            imagePathOn: 'Images/Icons/style-01/upload.png',
+            imagePathOff: 'Images/Icons/style-01/upload.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -104,8 +104,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'New Strategy',
             visible: false,
-            imagePathOn: 'Images/icons/style-01/quality.png',
-            imagePathOff: 'Images/icons/style-01/quality.png',
+            imagePathOn: 'Images/Icons/style-01/quality.png',
+            imagePathOff: 'Images/Icons/style-01/quality.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -116,8 +116,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Settings',
             visible: false,
-            imagePathOn: 'Images/icons/style-01/tools.png',
-            imagePathOff: 'Images/icons/style-01/tools.png',
+            imagePathOn: 'Images/Icons/style-01/tools.png',
+            imagePathOff: 'Images/Icons/style-01/tools.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -126,7 +126,7 @@ function newStrategyPartConstructor () {
         break
       }
       case 'Strategy': {
-        strategyPart.imagePath = 'Images/icons/style-01/quality.png'
+        strategyPart.imagePath = 'Images/Icons/style-01/quality.png'
         menuItemsInitialValues = [
           {
             action: 'Pin / Unpin',
@@ -134,8 +134,8 @@ function newStrategyPartConstructor () {
             currentStatus: false,
             label: undefined,
             visible: false,
-            imagePathOn: 'Images/icons/style-01/target.png',
-            imagePathOff: 'Images/icons/style-01/security.png',
+            imagePathOn: 'Images/Icons/style-01/target.png',
+            imagePathOff: 'Images/Icons/style-01/security.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -146,8 +146,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Delete This Strategy',
             visible: false,
-            imagePathOn: 'Images/icons/style-01/trash.png',
-            imagePathOff: 'Images/icons/style-01/trash.png',
+            imagePathOn: 'Images/Icons/style-01/trash.png',
+            imagePathOff: 'Images/Icons/style-01/trash.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -158,8 +158,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Settings',
             visible: false,
-            imagePathOn: 'Images/icons/style-01/tools.png',
-            imagePathOff: 'Images/icons/style-01/tools.png',
+            imagePathOn: 'Images/Icons/style-01/tools.png',
+            imagePathOff: 'Images/Icons/style-01/tools.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -168,7 +168,7 @@ function newStrategyPartConstructor () {
         break
       }
       case 'Strategy Entry Event': {
-        strategyPart.imagePath = 'Images/icons/style-01/startup.png'
+        strategyPart.imagePath = 'Images/Icons/style-01/startup.png'
         menuItemsInitialValues = [
           {
             action: 'Pin / Unpin',
@@ -176,8 +176,8 @@ function newStrategyPartConstructor () {
             currentStatus: false,
             label: undefined,
             visible: false,
-            imagePathOn: 'Images/icons/style-01/target.png',
-            imagePathOff: 'Images/icons/style-01/security.png',
+            imagePathOn: 'Images/Icons/style-01/target.png',
+            imagePathOff: 'Images/Icons/style-01/security.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -188,8 +188,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Add Situation',
             visible: false,
-            imagePathOn: 'Images/icons/style-01/attractive.png',
-            imagePathOff: 'Images/icons/style-01/attractive.png',
+            imagePathOn: 'Images/Icons/style-01/attractive.png',
+            imagePathOff: 'Images/Icons/style-01/attractive.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -198,7 +198,7 @@ function newStrategyPartConstructor () {
         break
       }
       case 'Strategy Exit Event': {
-        strategyPart.imagePath = 'Images/icons/style-01/support.png'
+        strategyPart.imagePath = 'Images/Icons/style-01/support.png'
         menuItemsInitialValues = [
           {
             action: 'Pin / Unpin',
@@ -206,8 +206,8 @@ function newStrategyPartConstructor () {
             currentStatus: false,
             label: undefined,
             visible: false,
-            imagePathOn: 'Images/icons/style-01/target.png',
-            imagePathOff: 'Images/icons/style-01/security.png',
+            imagePathOn: 'Images/Icons/style-01/target.png',
+            imagePathOff: 'Images/Icons/style-01/security.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -218,8 +218,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Add Situation',
             visible: false,
-            imagePathOn: 'Images/icons/style-01/attractive.png',
-            imagePathOff: 'Images/icons/style-01/attractive.png',
+            imagePathOn: 'Images/Icons/style-01/attractive.png',
+            imagePathOff: 'Images/Icons/style-01/attractive.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -228,7 +228,7 @@ function newStrategyPartConstructor () {
         break
       }
       case 'Trade Entry Event': {
-        strategyPart.imagePath = 'Images/icons/style-01/compass.png'
+        strategyPart.imagePath = 'Images/Icons/style-01/compass.png'
         menuItemsInitialValues = [
           {
             action: 'Pin / Unpin',
@@ -236,8 +236,8 @@ function newStrategyPartConstructor () {
             currentStatus: false,
             label: undefined,
             visible: false,
-            imagePathOn: 'Images/icons/style-01/target.png',
-            imagePathOff: 'Images/icons/style-01/security.png',
+            imagePathOn: 'Images/Icons/style-01/target.png',
+            imagePathOff: 'Images/Icons/style-01/security.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -248,8 +248,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Add Situation',
             visible: false,
-            imagePathOn: 'Images/icons/style-01/attractive.png',
-            imagePathOff: 'Images/icons/style-01/attractive.png',
+            imagePathOn: 'Images/Icons/style-01/attractive.png',
+            imagePathOff: 'Images/Icons/style-01/attractive.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -258,7 +258,7 @@ function newStrategyPartConstructor () {
         break
       }
       case 'Stop': {
-        strategyPart.imagePath = 'Images/icons/style-01/pixel.png'
+        strategyPart.imagePath = 'Images/Icons/style-01/pixel.png'
         menuItemsInitialValues = [
           {
             action: 'Pin / Unpin',
@@ -266,8 +266,8 @@ function newStrategyPartConstructor () {
             currentStatus: false,
             label: undefined,
             visible: false,
-            imagePathOn: 'Images/icons/style-01/target.png',
-            imagePathOff: 'Images/icons/style-01/security.png',
+            imagePathOn: 'Images/Icons/style-01/target.png',
+            imagePathOff: 'Images/Icons/style-01/security.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -278,8 +278,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Add Phase',
             visible: false,
-            imagePathOn: 'Images/icons/style-01/placeholder.png',
-            imagePathOff: 'Images/icons/style-01/placeholder.png',
+            imagePathOn: 'Images/Icons/style-01/placeholder.png',
+            imagePathOff: 'Images/Icons/style-01/placeholder.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -288,7 +288,7 @@ function newStrategyPartConstructor () {
         break
       }
       case 'Take Profit': {
-        strategyPart.imagePath = 'Images/icons/style-01/competition.png'
+        strategyPart.imagePath = 'Images/Icons/style-01/competition.png'
         menuItemsInitialValues = [
           {
             action: 'Pin / Unpin',
@@ -296,8 +296,8 @@ function newStrategyPartConstructor () {
             currentStatus: false,
             label: undefined,
             visible: false,
-            imagePathOn: 'Images/icons/style-01/target.png',
-            imagePathOff: 'Images/icons/style-01/security.png',
+            imagePathOn: 'Images/Icons/style-01/target.png',
+            imagePathOff: 'Images/Icons/style-01/security.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -308,8 +308,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Add Phase',
             visible: false,
-            imagePathOn: 'Images/icons/style-01/placeholder.png',
-            imagePathOff: 'Images/icons/style-01/placeholder.png',
+            imagePathOn: 'Images/Icons/style-01/placeholder.png',
+            imagePathOff: 'Images/Icons/style-01/placeholder.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -318,7 +318,7 @@ function newStrategyPartConstructor () {
         break
       }
       case 'Phase': {
-        strategyPart.imagePath = 'Images/icons/style-01/placeholder.png'
+        strategyPart.imagePath = 'Images/Icons/style-01/placeholder.png'
         strategyPart.codeEditor = newCodeEditor()
         strategyPart.codeEditor.isVisibleFunction = strategyPart.isVisibleFunction
         strategyPart.codeEditor.initialize()
@@ -331,8 +331,8 @@ function newStrategyPartConstructor () {
             currentStatus: false,
             label: undefined,
             visible: false,
-            imagePathOn: 'Images/icons/style-01/target.png',
-            imagePathOff: 'Images/icons/style-01/security.png',
+            imagePathOn: 'Images/Icons/style-01/target.png',
+            imagePathOff: 'Images/Icons/style-01/security.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -343,8 +343,8 @@ function newStrategyPartConstructor () {
             actionFunction: strategyPart.codeEditor.activate,
             label: 'Edit Code',
             visible: false,
-            imagePathOn: 'Images/icons/style-01/html.png',
-            imagePathOff: 'Images/icons/style-01/html.png',
+            imagePathOn: 'Images/Icons/style-01/html.png',
+            imagePathOff: 'Images/Icons/style-01/html.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -355,8 +355,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Add Situation',
             visible: false,
-            imagePathOn: 'Images/icons/style-01/attractive.png',
-            imagePathOff: 'Images/icons/style-01/attractive.png',
+            imagePathOn: 'Images/Icons/style-01/attractive.png',
+            imagePathOff: 'Images/Icons/style-01/attractive.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -367,8 +367,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Delete This Phase',
             visible: false,
-            imagePathOn: 'Images/icons/style-01/trash.png',
-            imagePathOff: 'Images/icons/style-01/trash.png',
+            imagePathOn: 'Images/Icons/style-01/trash.png',
+            imagePathOff: 'Images/Icons/style-01/trash.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -377,7 +377,7 @@ function newStrategyPartConstructor () {
         break
       }
       case 'Situation': {
-        strategyPart.imagePath = 'Images/icons/style-01/attractive.png'
+        strategyPart.imagePath = 'Images/Icons/style-01/attractive.png'
         menuItemsInitialValues = [
           {
             action: 'Pin / Unpin',
@@ -385,8 +385,8 @@ function newStrategyPartConstructor () {
             currentStatus: false,
             label: undefined,
             visible: false,
-            imagePathOn: 'Images/icons/style-01/target.png',
-            imagePathOff: 'Images/icons/style-01/security.png',
+            imagePathOn: 'Images/Icons/style-01/target.png',
+            imagePathOff: 'Images/Icons/style-01/security.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -397,8 +397,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Add Condition',
             visible: false,
-            imagePathOn: 'Images/icons/style-01/testing.png',
-            imagePathOff: 'Images/icons/style-01/testing.png',
+            imagePathOn: 'Images/Icons/style-01/testing.png',
+            imagePathOff: 'Images/Icons/style-01/testing.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -409,8 +409,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Delete This Situation',
             visible: false,
-            imagePathOn: 'Images/icons/style-01/trash.png',
-            imagePathOff: 'Images/icons/style-01/trash.png',
+            imagePathOn: 'Images/Icons/style-01/trash.png',
+            imagePathOff: 'Images/Icons/style-01/trash.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -419,7 +419,7 @@ function newStrategyPartConstructor () {
         break
       }
       case 'Condition': {
-        strategyPart.imagePath = 'Images/icons/style-01/testing.png'
+        strategyPart.imagePath = 'Images/Icons/style-01/testing.png'
         strategyPart.codeEditor = newCodeEditor()
         strategyPart.codeEditor.isVisibleFunction = strategyPart.isVisibleFunction
         strategyPart.codeEditor.initialize()
@@ -432,8 +432,8 @@ function newStrategyPartConstructor () {
             currentStatus: false,
             label: undefined,
             visible: false,
-            imagePathOn: 'Images/icons/style-01/target.png',
-            imagePathOff: 'Images/icons/style-01/security.png',
+            imagePathOn: 'Images/Icons/style-01/target.png',
+            imagePathOff: 'Images/Icons/style-01/security.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -444,8 +444,8 @@ function newStrategyPartConstructor () {
             actionFunction: strategyPart.codeEditor.activate,
             label: 'Edit Code',
             visible: false,
-            imagePathOn: 'Images/icons/style-01/html.png',
-            imagePathOff: 'Images/icons/style-01/html.png',
+            imagePathOn: 'Images/Icons/style-01/html.png',
+            imagePathOff: 'Images/Icons/style-01/html.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
@@ -456,8 +456,8 @@ function newStrategyPartConstructor () {
             actionFunction: payload.onMenuItemClick,
             label: 'Delete This Condition',
             visible: false,
-            imagePathOn: 'Images/icons/style-01/trash.png',
-            imagePathOff: 'Images/icons/style-01/trash.png',
+            imagePathOn: 'Images/Icons/style-01/trash.png',
+            imagePathOff: 'Images/Icons/style-01/trash.png',
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
diff --git a/Spaces/StrategySpace.js b/Spaces/StrategySpace.js
index c0a9dcad7..8b666a730 100644
--- a/Spaces/StrategySpace.js
+++ b/Spaces/StrategySpace.js
@@ -32,6 +32,62 @@ function newStrategySpace () {
     // thisObject.sidePanel.areas.push(thisObject.workplace)
   }
 
+  function loadIconCollection () {
+    const iconsNames = [
+      'analysis',
+      'analysis-1',
+      'approve',
+      'attach',
+      'attractive',
+      'brainstorming',
+      'broken-link',
+      'chat',
+      'chronometer',
+      'compass',
+      'competition',
+      'content',
+      'design-tool',
+      'grid',
+      'headphones',
+      'html',
+      'image',
+      'layout',
+      'loading',
+      'login',
+      'pantone',
+      'paper-plane',
+      'photo-camera',
+      'piggy-bank',
+      'pipette',
+      'pixel',
+      'placeholder',
+      'planning',
+      'promotion',
+      'pyramid',
+      'quality',
+      'responsive',
+      'schedule',
+      'search',
+      'security',
+      'settings',
+      'sitemap',
+      'startup',
+      'support',
+      'tap',
+      'target',
+      'targeting',
+      'task',
+      'testing',
+      'text',
+      'timeline',
+      'tools',
+      'trash',
+      'upload',
+      'vector',
+      'video-player'
+    ]
+  }
+
   function makeVisible () {
     if (thisObject.workplace.isDeployed !== true) {
       thisObject.workplace.deploydTradingSystem()