diff --git a/Step/wwwroot/assets/images/Shank.png b/Step/wwwroot/assets/images/Shank.png
new file mode 100644
index 00000000..c87c68e4
Binary files /dev/null and b/Step/wwwroot/assets/images/Shank.png differ
diff --git a/Step/wwwroot/assets/images/list-Shank2.png b/Step/wwwroot/assets/images/list-Shank2.png
new file mode 100644
index 00000000..50888ab8
Binary files /dev/null and b/Step/wwwroot/assets/images/list-Shank2.png differ
diff --git a/Step/wwwroot/assets/images/list-blade.PNG b/Step/wwwroot/assets/images/list-blade.PNG
new file mode 100644
index 00000000..f0d13f8f
Binary files /dev/null and b/Step/wwwroot/assets/images/list-blade.PNG differ
diff --git a/Step/wwwroot/assets/images/list-mag-pos.png b/Step/wwwroot/assets/images/list-mag-pos.png
new file mode 100644
index 00000000..2aee2211
Binary files /dev/null and b/Step/wwwroot/assets/images/list-mag-pos.png differ
diff --git a/Step/wwwroot/assets/images/list-tool.PNG b/Step/wwwroot/assets/images/list-tool.PNG
new file mode 100644
index 00000000..f79e0e40
Binary files /dev/null and b/Step/wwwroot/assets/images/list-tool.PNG differ
diff --git a/Step/wwwroot/assets/images/list-undefined.PNG b/Step/wwwroot/assets/images/list-undefined.PNG
new file mode 100644
index 00000000..89d489ae
Binary files /dev/null and b/Step/wwwroot/assets/images/list-undefined.PNG differ
diff --git a/Step/wwwroot/assets/images/tool.PNG b/Step/wwwroot/assets/images/tool.PNG
deleted file mode 100644
index 87461158..00000000
Binary files a/Step/wwwroot/assets/images/tool.PNG and /dev/null differ
diff --git a/Step/wwwroot/assets/styles/base/card.less b/Step/wwwroot/assets/styles/base/card.less
index ffaa1d66..ead87536 100644
--- a/Step/wwwroot/assets/styles/base/card.less
+++ b/Step/wwwroot/assets/styles/base/card.less
@@ -116,13 +116,20 @@
   &.selected{
     background-color: rgba(23, 145, 255, 0.75);
     color: #fff;
+    .image{    
+        background-color: #FFF; 
+    }
   }
 
-  .image{
+  .image{    
       display: flex;
       align-items: center;
       justify-content: center;
-      margin: 16px 14px 16px 16px;
+      margin-top: 8px;
+      margin-left: 14px;
+      width: 48px;
+      height: 48px;
+      background-color: #DDD; 
       img{
           width: 48px;
           height: 48px;
@@ -133,6 +140,7 @@
           text-align: left;
           width:145px;
           margin-top: 11px;
+          margin-left: 14px;
 
   }
 }
diff --git a/Step/wwwroot/assets/styles/base/tooling-equipment.less b/Step/wwwroot/assets/styles/base/tooling-equipment.less
index 7b742b8e..1524bdc5 100644
--- a/Step/wwwroot/assets/styles/base/tooling-equipment.less
+++ b/Step/wwwroot/assets/styles/base/tooling-equipment.less
@@ -173,9 +173,6 @@
 }
 
 .tooling-families-container, .tooling-shanks-container, .tooling-magpos-container{
-    & img:empty{
-        display: none;
-    }
 
     .text-body div + div{
         margin-top: 11px;
diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css
index 665c48c4..927355f8 100644
--- a/Step/wwwroot/assets/styles/style.css
+++ b/Step/wwwroot/assets/styles/style.css
@@ -2789,11 +2789,18 @@ footer .container button.big:before {
   background-color: rgba(23, 145, 255, 0.75);
   color: #fff;
 }
+.equipment.selected .image {
+  background-color: #FFF;
+}
 .equipment .image {
   display: flex;
   align-items: center;
   justify-content: center;
-  margin: 16px 14px 16px 16px;
+  margin-top: 8px;
+  margin-left: 14px;
+  width: 48px;
+  height: 48px;
+  background-color: #DDD;
 }
 .equipment .image img {
   width: 48px;
@@ -2803,6 +2810,7 @@ footer .container button.big:before {
   text-align: left;
   width: 145px;
   margin-top: 11px;
+  margin-left: 14px;
 }
 .input-box {
   width: 100%;
@@ -5549,11 +5557,6 @@ footer .container button.big:before {
   font-size: 18px;
   font-weight: 600;
 }
-.tooling-families-container img:empty,
-.tooling-shanks-container img:empty,
-.tooling-magpos-container img:empty {
-  display: none;
-}
 .tooling-families-container .text-body div + div,
 .tooling-shanks-container .text-body div + div,
 .tooling-magpos-container .text-body div + div {
diff --git a/Step/wwwroot/src/components/tooling-equipment.ts b/Step/wwwroot/src/components/tooling-equipment.ts
index 1588e1b7..34ca24b8 100644
--- a/Step/wwwroot/src/components/tooling-equipment.ts
+++ b/Step/wwwroot/src/components/tooling-equipment.ts
@@ -74,6 +74,17 @@ export default class toolingEquipment extends Vue {
     this.$router.push({ path: path});
   }
 
+  public getToolIcon = function (id) {
+    if(id == 9999)
+      return "../assets/images/list-undefined.PNG"
+    else if(id == 151 || id == 700 )
+        return "../assets/images/list-blade.PNG"
+    else
+      return "../assets/images/list-tool.PNG"
+  }
+
+  
+
   async save(item){
     item.name = "";
     toolingActions.updateToolsConfiguration(store,item);
diff --git a/Step/wwwroot/src/components/tooling-equipment.vue b/Step/wwwroot/src/components/tooling-equipment.vue
index 31f10252..009d4947 100644
--- a/Step/wwwroot/src/components/tooling-equipment.vue
+++ b/Step/wwwroot/src/components/tooling-equipment.vue
@@ -21,7 +21,7 @@
                   </div>
                   <div class="list-vertical scrollable">
                       <equipment v-for="t in tools" :key="t.id" :code="t.id" :title="t.familyName" 
-                                 img-source="../assets/images/tool.PNG"
+                                 :img-source="getToolIcon(t.toolType)"
                                  :class="{selected: selectedTool == t}"
                                  @click="selectTool(t)"></equipment>
                   </div>
diff --git a/Step/wwwroot/src/components/tooling-magpos.vue b/Step/wwwroot/src/components/tooling-magpos.vue
index 49aa8876..ebc4c25c 100644
--- a/Step/wwwroot/src/components/tooling-magpos.vue
+++ b/Step/wwwroot/src/components/tooling-magpos.vue
@@ -22,6 +22,7 @@
                   <div class="list-vertical scrollable">
                       <equipment v-for="(m,k) in magpos" :key="k" :code="'Magazzino' + ' ' + m.magazineId" :title="'Manina' + ' ' + m.id"
                                  :class="{selected: selectedTool == m}"
+                                 :img-source="'../assets/images/list-mag-pos.PNG'"
                                  @click="selectTool(m)"></equipment>
                   </div>
                   <div class="footer">
diff --git a/Step/wwwroot/src/components/tooling-shanks.vue b/Step/wwwroot/src/components/tooling-shanks.vue
index 93e53c07..4c9b5fe9 100644
--- a/Step/wwwroot/src/components/tooling-shanks.vue
+++ b/Step/wwwroot/src/components/tooling-shanks.vue
@@ -22,6 +22,7 @@
                   <div class="list-vertical scrollable">
                       <equipment v-for="s in shanks" :key="s.id" :title="'Codolo' + ' ' + s.id"
                                  v-if="s.id != ''"
+                                 :img-source="'../assets/images/shank.PNG'"
                                  :class="{selected: selectedTool == s}"
                                  @click="selectTool(s)"></equipment>
                   </div>
diff --git a/Step/wwwroot/src/modules/base-components/cards/equipment.vue b/Step/wwwroot/src/modules/base-components/cards/equipment.vue
index 66e66e0a..e88e890f 100644
--- a/Step/wwwroot/src/modules/base-components/cards/equipment.vue
+++ b/Step/wwwroot/src/modules/base-components/cards/equipment.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- <div class="test-container"> -->
       <div class="equipment" @click="onClick">
-        <div class="image">
+        <div v-if="imgSource" class="image">
           <img :src="imgSource" alt="">
         </div>
         <div class="text-body">