diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll
index c05b5198..1799058d 100644
Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ
diff --git a/Step/wwwroot/assets/icons/Tools/Families.png b/Step/wwwroot/assets/icons/Tools/Families.png
new file mode 100644
index 00000000..adc58e78
Binary files /dev/null and b/Step/wwwroot/assets/icons/Tools/Families.png differ
diff --git a/Step/wwwroot/assets/images/list-blade.PNG b/Step/wwwroot/assets/icons/Tools/Magpos.png
similarity index 60%
rename from Step/wwwroot/assets/images/list-blade.PNG
rename to Step/wwwroot/assets/icons/Tools/Magpos.png
index f0d13f8f..04d75776 100644
Binary files a/Step/wwwroot/assets/images/list-blade.PNG and b/Step/wwwroot/assets/icons/Tools/Magpos.png differ
diff --git a/Step/wwwroot/assets/icons/Tools/Psd/Families.psd b/Step/wwwroot/assets/icons/Tools/Psd/Families.psd
new file mode 100644
index 00000000..77858f17
Binary files /dev/null and b/Step/wwwroot/assets/icons/Tools/Psd/Families.psd differ
diff --git a/Step/wwwroot/assets/icons/Tools/Psd/Magpos.psd b/Step/wwwroot/assets/icons/Tools/Psd/Magpos.psd
new file mode 100644
index 00000000..4d0dc289
Binary files /dev/null and b/Step/wwwroot/assets/icons/Tools/Psd/Magpos.psd differ
diff --git a/Step/wwwroot/assets/icons/Tools/Psd/Shanks.psd b/Step/wwwroot/assets/icons/Tools/Psd/Shanks.psd
new file mode 100644
index 00000000..063e07ec
Binary files /dev/null and b/Step/wwwroot/assets/icons/Tools/Psd/Shanks.psd differ
diff --git a/Step/wwwroot/assets/icons/Tools/Psd/Tools.psd b/Step/wwwroot/assets/icons/Tools/Psd/Tools.psd
new file mode 100644
index 00000000..0e7d2b92
Binary files /dev/null and b/Step/wwwroot/assets/icons/Tools/Psd/Tools.psd differ
diff --git a/Step/wwwroot/assets/icons/Tools/Psd/Undefined.psd b/Step/wwwroot/assets/icons/Tools/Psd/Undefined.psd
new file mode 100644
index 00000000..90f9eae7
Binary files /dev/null and b/Step/wwwroot/assets/icons/Tools/Psd/Undefined.psd differ
diff --git a/Step/wwwroot/assets/icons/Tools/Psd/saw.psd b/Step/wwwroot/assets/icons/Tools/Psd/saw.psd
new file mode 100644
index 00000000..00543ac2
Binary files /dev/null and b/Step/wwwroot/assets/icons/Tools/Psd/saw.psd differ
diff --git a/Step/wwwroot/assets/images/list-mag-pos.png b/Step/wwwroot/assets/icons/Tools/Saw.png
similarity index 60%
rename from Step/wwwroot/assets/images/list-mag-pos.png
rename to Step/wwwroot/assets/icons/Tools/Saw.png
index 2aee2211..2b6ea99a 100644
Binary files a/Step/wwwroot/assets/images/list-mag-pos.png and b/Step/wwwroot/assets/icons/Tools/Saw.png differ
diff --git a/Step/wwwroot/assets/images/list-tool.PNG b/Step/wwwroot/assets/icons/Tools/Shanks.png
similarity index 50%
rename from Step/wwwroot/assets/images/list-tool.PNG
rename to Step/wwwroot/assets/icons/Tools/Shanks.png
index f79e0e40..623f748e 100644
Binary files a/Step/wwwroot/assets/images/list-tool.PNG and b/Step/wwwroot/assets/icons/Tools/Shanks.png differ
diff --git a/Step/wwwroot/assets/images/list-families.png b/Step/wwwroot/assets/icons/Tools/Tools.png
similarity index 76%
rename from Step/wwwroot/assets/images/list-families.png
rename to Step/wwwroot/assets/icons/Tools/Tools.png
index b442ce1c..16d3eadb 100644
Binary files a/Step/wwwroot/assets/images/list-families.png and b/Step/wwwroot/assets/icons/Tools/Tools.png differ
diff --git a/Step/wwwroot/assets/images/list-Shank.png b/Step/wwwroot/assets/icons/Tools/Undefined.png
similarity index 72%
rename from Step/wwwroot/assets/images/list-Shank.png
rename to Step/wwwroot/assets/icons/Tools/Undefined.png
index c87c68e4..ab3e83ca 100644
Binary files a/Step/wwwroot/assets/images/list-Shank.png and b/Step/wwwroot/assets/icons/Tools/Undefined.png differ
diff --git a/Step/wwwroot/assets/icons/_png/fresa-raggiatura-104x104.png b/Step/wwwroot/assets/icons/_png/fresa-raggiatura-104x104.png
deleted file mode 100644
index e01f4c19..00000000
Binary files a/Step/wwwroot/assets/icons/_png/fresa-raggiatura-104x104.png and /dev/null differ
diff --git a/Step/wwwroot/assets/icons/_png/fresa-raggiatura-48x48.png b/Step/wwwroot/assets/icons/_png/fresa-raggiatura-48x48.png
deleted file mode 100644
index fffaeda1..00000000
Binary files a/Step/wwwroot/assets/icons/_png/fresa-raggiatura-48x48.png and /dev/null differ
diff --git a/Step/wwwroot/assets/icons/_png/fresa-raggiatura-popup-280x280.png b/Step/wwwroot/assets/icons/_png/fresa-raggiatura-popup-280x280.png
deleted file mode 100644
index cf81ec5e..00000000
Binary files a/Step/wwwroot/assets/icons/_png/fresa-raggiatura-popup-280x280.png and /dev/null differ
diff --git a/Step/wwwroot/assets/icons/_png/milling-cutter-104x104.png b/Step/wwwroot/assets/icons/_png/milling-cutter-104x104.png
deleted file mode 100644
index 17b58a6d..00000000
Binary files a/Step/wwwroot/assets/icons/_png/milling-cutter-104x104.png and /dev/null differ
diff --git a/Step/wwwroot/assets/icons/_png/milling-cutter-48x48.png b/Step/wwwroot/assets/icons/_png/milling-cutter-48x48.png
deleted file mode 100644
index ff0eaa83..00000000
Binary files a/Step/wwwroot/assets/icons/_png/milling-cutter-48x48.png and /dev/null differ
diff --git a/Step/wwwroot/assets/icons/_png/milling-cutter-popup-280x280.png b/Step/wwwroot/assets/icons/_png/milling-cutter-popup-280x280.png
deleted file mode 100644
index 79940451..00000000
Binary files a/Step/wwwroot/assets/icons/_png/milling-cutter-popup-280x280.png and /dev/null differ
diff --git a/Step/wwwroot/assets/images/list-Shank2.png b/Step/wwwroot/assets/images/list-Shank2.png
deleted file mode 100644
index 50888ab8..00000000
Binary files a/Step/wwwroot/assets/images/list-Shank2.png and /dev/null differ
diff --git a/Step/wwwroot/assets/images/list-undefined.PNG b/Step/wwwroot/assets/images/list-undefined.PNG
deleted file mode 100644
index 89d489ae..00000000
Binary files a/Step/wwwroot/assets/images/list-undefined.PNG and /dev/null differ
diff --git a/Step/wwwroot/assets/styles/base/card.less b/Step/wwwroot/assets/styles/base/card.less
index eb338e54..1dcabeb0 100644
--- a/Step/wwwroot/assets/styles/base/card.less
+++ b/Step/wwwroot/assets/styles/base/card.less
@@ -336,6 +336,11 @@
         .card-tool-depot-image{
             margin-top: 20px;
             margin-left: 18px;
+            img{
+                max-width: 104px;
+                max-height: 104px;
+
+            }
         }
         .card-tool-depot-title{
             display: flex;
diff --git a/Step/wwwroot/assets/styles/base/input.less b/Step/wwwroot/assets/styles/base/input.less
index 211b6381..6fa12e59 100644
--- a/Step/wwwroot/assets/styles/base/input.less
+++ b/Step/wwwroot/assets/styles/base/input.less
@@ -41,7 +41,7 @@ sans-serif;
         padding: 0;
         width: 100%;
     }
-    input.invalid, input[aria-invalid="true"] {
+    input.invalid:not([readonly]), input[aria-invalid="true"]:not([readonly]) {
         border-color: @color-scarlet;
     }
     small.error {
@@ -68,6 +68,6 @@ sans-serif;
     margin: auto !important;
 }
 
-input[aria-invalid="true"] {
+input[aria-invalid="true"]:not([readonly]) {
   border-color: @color-scarlet !important;
 }
diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css
index 2927b35e..f66fcccc 100644
--- a/Step/wwwroot/assets/styles/style.css
+++ b/Step/wwwroot/assets/styles/style.css
@@ -599,8 +599,8 @@
   padding: 0;
   width: 100%;
 }
-.form-group input.invalid,
-.form-group input[aria-invalid="true"] {
+.form-group input.invalid:not([readonly]),
+.form-group input[aria-invalid="true"]:not([readonly]) {
   border-color: #d0021b;
 }
 .form-group small.error {
@@ -622,7 +622,7 @@
 .block-center {
   margin: auto !important;
 }
-input[aria-invalid="true"] {
+input[aria-invalid="true"]:not([readonly]) {
   border-color: #d0021b !important;
 }
 button:focus {
@@ -3357,6 +3357,10 @@ footer .container button.big:before {
   margin-top: 20px;
   margin-left: 18px;
 }
+.card-tool-depot .card-tool-depot-body .card-tool-depot-image img {
+  max-width: 104px;
+  max-height: 104px;
+}
 .card-tool-depot .card-tool-depot-body .card-tool-depot-title {
   display: flex;
   height: 100%;
diff --git a/Step/wwwroot/src/components/depot.ts b/Step/wwwroot/src/components/depot.ts
index a36b7390..770086c7 100644
--- a/Step/wwwroot/src/components/depot.ts
+++ b/Step/wwwroot/src/components/depot.ts
@@ -147,4 +147,13 @@ export default class depot extends Vue {
 
     
   }
+
+  public getInfoEquipmentIcon(id) {
+    console.log(id);
+    if(id && (id==151 || id==700))
+        return "../assets/icons/Tools/Saw.png";
+    else  
+        return "../assets/icons/Tools/Tools.png";
+  }
+
 }
diff --git a/Step/wwwroot/src/components/info-equipment.ts b/Step/wwwroot/src/components/info-equipment.ts
index a3f78594..76f46164 100644
--- a/Step/wwwroot/src/components/info-equipment.ts
+++ b/Step/wwwroot/src/components/info-equipment.ts
@@ -58,8 +58,16 @@ export default class InfoEquipment extends Vue {
     }
 
     public getInfoEquipmentIcon() {
-        return "../assets/icons/_png/fresa-raggiatura-popup-280x280.png"
+        if(!this.enableModals){
+            if(this.selectedTool && (this.selectedTool.toolType==151 || this.selectedTool.toolType==700))
+                return "../assets/icons/Tools/Saw.png";
+            else  
+                return "../assets/icons/Tools/Tools.png";
+        }
+        else
+            return "../assets/icons/Tools/Shanks.png";
     }
+    
     public close(){
         Factory.Get(MessageService).deleteChannel("esc_pressed");
         ModalHelper.HideModal();
diff --git a/Step/wwwroot/src/components/tooling-equipment.ts b/Step/wwwroot/src/components/tooling-equipment.ts
index 5172c971..d083bef8 100644
--- a/Step/wwwroot/src/components/tooling-equipment.ts
+++ b/Step/wwwroot/src/components/tooling-equipment.ts
@@ -224,11 +224,11 @@ export default class toolingEquipment extends Vue {
 
   public getToolIcon = function (id) {
     if (id == 9999)
-      return "../assets/images/list-undefined.PNG"
+      return "../assets/iicons/Tools/Undefined.png"
     else if (id == 151 || id == 700)
-      return "../assets/images/list-blade.PNG"
+      return "../assets/icons/Tools/Saw.png"
     else
-      return "../assets/images/list-tool.PNG"
+      return "../assets/icons/Tools/Tools.png"
   }
 
   private internalCounter = -1;
diff --git a/Step/wwwroot/src/components/tooling-families.vue b/Step/wwwroot/src/components/tooling-families.vue
index 52cf47aa..ea334b6f 100644
--- a/Step/wwwroot/src/components/tooling-families.vue
+++ b/Step/wwwroot/src/components/tooling-families.vue
@@ -22,7 +22,7 @@
                   <div class="list-vertical scrollable" ref="familyList" >
                       <equipment v-for="f in families.filter(f => f.name.toLowerCase().indexOf(currentFilter) >=0)" :key="f.uid" :title="f.name || f.oldName"
                                  :class="{selected: selectedTool && selectedTool.uid == f.uid}"
-                                 :img-source="'../assets/images/list-families.PNG'"
+                                 :img-source="'../assets/icons/Tools/Families.png'"
                                  @click="selectTool(f)"></equipment>
                   </div>
                   <div class="footer" v-if="!(isSiemens() || isDemo())">
diff --git a/Step/wwwroot/src/components/tooling-magpos.vue b/Step/wwwroot/src/components/tooling-magpos.vue
index 8c901c2a..dc9d283d 100644
--- a/Step/wwwroot/src/components/tooling-magpos.vue
+++ b/Step/wwwroot/src/components/tooling-magpos.vue
@@ -22,7 +22,7 @@
                   <div class="list-vertical scrollable">
                       <equipment v-for="(m,k) in magpos.filter(m =>(($options.filters.localize('tooling_magpos','Manina')) + ' ' + m.positionId).toString().toLowerCase().indexOf(currentFilter) >=0)" :key="k" :code=" $options.filters.localize('tooling_magazine','Magazzino') + ' ' + m.magazineId" :title="$options.filters.localize('tooling_magpos','Manina') + ' ' + m.positionId"
                                  :class="{selected: selectedTool && selectedTool.positionId == m.positionId && selectedTool.magazineId == m.magazineId   }"
-                                 :img-source="'../assets/images/list-mag-pos.PNG'"
+                                 :img-source="'../assets/icons/Tools/Magpos.png'"
                                  @click="selectTool(m)"></equipment>
                   </div>
               </div>
diff --git a/Step/wwwroot/src/components/tooling-shanks.vue b/Step/wwwroot/src/components/tooling-shanks.vue
index 33976e19..4239562a 100644
--- a/Step/wwwroot/src/components/tooling-shanks.vue
+++ b/Step/wwwroot/src/components/tooling-shanks.vue
@@ -22,7 +22,7 @@
                   <div class="list-vertical scrollable" ref="shankList">
                       <equipment v-for="s in shanks.filter(i => ($options.filters.localize('tooling_shanks_name','Codolo %d',i.id)).toLowerCase().indexOf(currentFilter) >=0)" :key="s.id" :title="'tooling_shanks_name' | localize('Codolo %d', s.id)"
                                  v-if="s.id != null"
-                                 :img-source="'../assets/images/list-shank.PNG'"
+                                 :img-source="'../assets/icons/Tools/Shanks.png'"
                                  :class="{selected: selectedTool && selectedTool.id == s.id}"
                                  @click="selectTool(s)"></equipment>
                   </div>