diff --git a/Step/wwwroot/assets/styles/base/maintenance.less b/Step/wwwroot/assets/styles/base/maintenance.less
index 8c482172..9346b0a2 100644
--- a/Step/wwwroot/assets/styles/base/maintenance.less
+++ b/Step/wwwroot/assets/styles/base/maintenance.less
@@ -71,7 +71,7 @@
                             width: 288px;
                             height: 48px;
                             border-radius: 2px;
-                            box-shadow: 0 1px 3px 0 @color-black-50;
+                            box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4);
                             border: solid 1px @color-silver;
                             font-size: 18px;
                             line-height: 1.11;
diff --git a/Step/wwwroot/src/@types/tooling.d.ts b/Step/wwwroot/src/@types/tooling.d.ts
index 19bf5893..962b9d55 100644
--- a/Step/wwwroot/src/@types/tooling.d.ts
+++ b/Step/wwwroot/src/@types/tooling.d.ts
@@ -214,6 +214,7 @@ declare module server {
     disabled: boolean,
     canLoadTool: boolean,
     busyStatus: number,
+    usedBySpindle: boolean,
   }
 
   export interface NcMagazinesPositions {
diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts b/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts
index ca213cee..22792f38 100644
--- a/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts
+++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts
@@ -490,7 +490,6 @@ export default class depot extends Vue {
       toolingActions.updateBusyStatusPositions(store,this.magazineType,this.depotNc); 
     this.onLoading = false;
 
-    // this.magazines;
   }
 
   public dataForOpenInfoShank(id) {
diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.vue b/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.vue
index 20e8829f..664df37a 100644
--- a/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.vue
+++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.vue
@@ -60,7 +60,7 @@
                                 :shoud-animate-drop="disableDropAnimation"
                                 @drag-enter="onDragEnter(pos.positionId)" @drag-leave="onDragLeave()"
                                 @drop="addToDepotPosition(pos, $event)">
-                              <span class="empty" v-if="!toolAtPosition(pos.positionId) && pos.canLoadTool && checkMagPosType(pos.type) && draggingIn">{{'depot_avaiable_position' | localize("Posizione disponibile")}}</span>
+                              <span class="empty" v-if="!toolAtPosition(pos.positionId) && pos.canLoadTool && !pos.usedBySpindle && checkMagPosType(pos.type) && draggingIn">{{'depot_avaiable_position' | localize("Posizione disponibile")}}</span>
                            </Container>
                             <card-tool-depot :class="{'stateProblemsTool': enableStateProblemTool && toolIsInError(returnChild(toolAtPosition(pos.positionId)))}" 
                                 v-if="toolAtPosition(pos.positionId)"
@@ -71,6 +71,9 @@
                                 @click="removeToolsToDepot(pos.positionId, toolAtPosition(pos.positionId))"
                                 @clickinfo="toolAtPosition(pos.positionId).childShank ? openInfoShank(toolAtPosition(pos.positionId).toolId) : openInfoEquipment(toolAtPosition(pos.positionId).toolId)">
                             </card-tool-depot>
+                            <div>                                
+                                <img src="assets/icons/MagPos/Spindle.png" />
+                            </div>
                             <card-busy-depot v-if="!toolAtPosition(pos.positionId)" :type=pos.busyStatus></card-busy-depot>
                         </detail-card>
                       </div>
diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts b/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts
index 9118f898..1b0b71f8 100644
--- a/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts
+++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts
@@ -300,11 +300,11 @@ export default class toolingEquipment extends Vue {
 
   public addEquipment() {
     this.selectedTool = {};
+    this.fieldTool(this.selectedTool);
     this.enableEquipment = false;
     this.enableParameters = true;
     this.enableModify = true;
     this.disableList = true;
-    this.fieldTool(this.selectedTool);
   }
 
   public getDynamicFields(tooltype: string): Array<string> {
diff --git a/Step/wwwroot/src/modules/base-components/cards/input-box.vue b/Step/wwwroot/src/modules/base-components/cards/input-box.vue
index 8a35611c..e9147a51 100644
--- a/Step/wwwroot/src/modules/base-components/cards/input-box.vue
+++ b/Step/wwwroot/src/modules/base-components/cards/input-box.vue
@@ -17,7 +17,7 @@
               <div class="incrementnumber" v-if="type=='int' || type=='double'" >
                 <input v-model="bindingValue" type="number"
                     :min="minValue" :max="maxValue" v-validate.initial="{min_value:minValue, max_value: maxValue || 9999999}"
-                     :readonly="readOnly" @blur="here">
+                     :readonly="readOnly" @blur="outFocus">
                 <button v-if="!readOnly && !disabledControl" type="button" class="btn" @click="dwvalue()"><i class="fa fa-minus"></i></button>
                 <button v-if="!readOnly && !disabledControl" type="button" class="btn" @click="upvalue()"><i class="fa fa-plus"></i></button>
               </div>
@@ -69,7 +69,7 @@ export default {
         this.bindingValue = this.minValue;
 
     },
-    here(){
+    outFocus(){
       if(Number(this.bindingValue) > this.maxValue)
         this.bindingValue = this.maxValue;
       if(Number(this.bindingValue) < this.minValue)
diff --git a/Step/wwwroot/src/store/tooling.store.ts b/Step/wwwroot/src/store/tooling.store.ts
index a87dffc1..7567e8e7 100644
--- a/Step/wwwroot/src/store/tooling.store.ts
+++ b/Step/wwwroot/src/store/tooling.store.ts
@@ -438,7 +438,7 @@ export const toolingStore = {
       else
         positionMagazines = store.magPosNcDepot;
       
-        var maxPos = positionMagazines.length; 
+      var maxPos = positionMagazines.length; 
 
       //Check if is enabled
       positionMagazines.forEach(element => {
@@ -465,7 +465,6 @@ export const toolingStore = {
           dimleft = element.maxLeft/2.0;  
           dimright = element.maxRight/2.0;  
         }
-
         //Check dimensions
         if(dimleft<0.5)
           dimleft = 0.5;    
@@ -475,11 +474,12 @@ export const toolingStore = {
         passo = dimright/0.5;
         start = 0;
 
+
         //Set tool RIGHT size
         for (let index = 0; index < passo; index++) {
           start = start + 0.5
           position = element.positionId + Math.floor(start) -1
-          if(magazineType == 0){
+          if(magazineType != 1 && magazineType != 2){
             if(position>=0 && position < maxPos){
               if(positionMagazines[position].busyStatus > 0){
                 if(positionMagazines[position].busyStatus == 4)
@@ -494,15 +494,17 @@ export const toolingStore = {
             if(position<0)
               position = maxPos + position;
             if(position>=maxPos)
-              position = position - maxPos;
-            if(positionMagazines[position].busyStatus > 0){
-              if(positionMagazines[position].busyStatus == 4)
-                positionMagazines[position].busyStatus = 3;  
-              else if(positionMagazines[position].busyStatus == 2)
-                positionMagazines[position].busyStatus = 1;  
-              else if(positionMagazines[position].busyStatus == 3)
-                positionMagazines[position].busyStatus = 0; 
-            }   
+              position = position - maxPos;            
+            if(position>=0 && position < maxPos){
+              if(positionMagazines[position].busyStatus > 0){
+                if(positionMagazines[position].busyStatus == 4)
+                  positionMagazines[position].busyStatus = 3;  
+                else if(positionMagazines[position].busyStatus == 2)
+                  positionMagazines[position].busyStatus = 1;  
+                else if(positionMagazines[position].busyStatus == 3)
+                  positionMagazines[position].busyStatus = 0; 
+              }   
+            }
           }
         }
         passo = dimleft/0.5;
@@ -512,7 +514,7 @@ export const toolingStore = {
         for (let index = 0; index < passo; index++) {
           start = start + 0.5
           position = element.positionId - Math.floor(start) -1
-          if(magazineType == 0){
+          if(magazineType != 1 && magazineType != 2){
             if(position>=0 && position < maxPos){
               if(positionMagazines[position].busyStatus > 0){
                 if(positionMagazines[position].busyStatus == 4)
@@ -528,14 +530,16 @@ export const toolingStore = {
               position = maxPos + position;
             if(position>=maxPos)
               position = position - maxPos;
-            if(positionMagazines[position].busyStatus > 0){
-              if(positionMagazines[position].busyStatus == 4)
-                positionMagazines[position].busyStatus = 2;  
-              else if(positionMagazines[position].busyStatus == 3)
-                positionMagazines[position].busyStatus = 1;  
-              else if(positionMagazines[position].busyStatus == 2)
-                positionMagazines[position].busyStatus = 0; 
-            }   
+            if(position>=0 && position < maxPos){
+              if(positionMagazines[position].busyStatus > 0){
+                if(positionMagazines[position].busyStatus == 4)
+                  positionMagazines[position].busyStatus = 2;  
+                else if(positionMagazines[position].busyStatus == 3)
+                  positionMagazines[position].busyStatus = 1;  
+                else if(positionMagazines[position].busyStatus == 2)
+                  positionMagazines[position].busyStatus = 0; 
+               }   
+            }
           }                          
         }  
 
@@ -574,7 +578,7 @@ export const toolingStore = {
           position = element.positionId -1 - index;
 
           //Base on magazineType
-          if(magazineType == 0){
+          if(magazineType != 1 && magazineType != 2){
             if(position>=0 && position < maxPos)
               positionMagazines[position].canLoadTool = false
           }else{
@@ -589,7 +593,7 @@ export const toolingStore = {
           position = element.positionId -1 + index;      
 
           //Base on magazineType      
-          if(magazineType == 0){
+          if(magazineType != 1 && magazineType != 2){
             if(position>=0 && position < maxPos)
               positionMagazines[position].canLoadTool = false
           }else{
@@ -621,7 +625,7 @@ export const toolingStore = {
             position = element.positionId -1 - index;
 
             //Base on magazineType
-            if(magazineType == 0){
+            if(magazineType != 1 && magazineType != 2){
               if(position>=0 && position < maxPos)
                 positionMagazines[position].canLoadTool = false
             }else{
@@ -637,7 +641,7 @@ export const toolingStore = {
             position = element.positionId -1 + index;      
 
             //Base on magazineType      
-            if(magazineType == 0){
+            if(magazineType != 1 && magazineType != 2){
               if(position>=0 && position < maxPos)
                 positionMagazines[position].canLoadTool = false
             }else{