diff --git a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
index c9cc13eab..843c28a28 100755
--- a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
+++ b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
@@ -4106,7 +4106,7 @@
           </attributes>
         </naming>
         <display_template/>
-        <icon>images/databaseschema.jpg</icon>
+        <icon>images/database-schema.png</icon>
         <reconciliation>
           <attributes>
             <attribute id="name"/>
diff --git a/datamodels/2.x/itop-config-mgmt/images/building.png b/datamodels/2.x/itop-config-mgmt/images/building.png
index e7350ee3e..94fdeae82 100755
Binary files a/datamodels/2.x/itop-config-mgmt/images/building.png and b/datamodels/2.x/itop-config-mgmt/images/building.png differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/databaseschema.jpg b/datamodels/2.x/itop-config-mgmt/images/databaseschema.jpg
deleted file mode 100755
index bf085800e..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/databaseschema.jpg and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/interface.png b/datamodels/2.x/itop-config-mgmt/images/interface.png
index 63800057f..8aa046405 100755
Binary files a/datamodels/2.x/itop-config-mgmt/images/interface.png and b/datamodels/2.x/itop-config-mgmt/images/interface.png differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/server.png b/datamodels/2.x/itop-config-mgmt/images/server.png
index f72c54213..9a70caace 100755
Binary files a/datamodels/2.x/itop-config-mgmt/images/server.png and b/datamodels/2.x/itop-config-mgmt/images/server.png differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/switch.png b/datamodels/2.x/itop-config-mgmt/images/switch.png
index 5d8c49354..1df637fa9 100755
Binary files a/datamodels/2.x/itop-config-mgmt/images/switch.png and b/datamodels/2.x/itop-config-mgmt/images/switch.png differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/webapp.png b/datamodels/2.x/itop-config-mgmt/images/webapp.png
index d3bbd81d6..3506f6c07 100755
Binary files a/datamodels/2.x/itop-config-mgmt/images/webapp.png and b/datamodels/2.x/itop-config-mgmt/images/webapp.png differ
diff --git a/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml b/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
index 467ed51ed..48dae2991 100755
--- a/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
+++ b/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
@@ -405,7 +405,7 @@
           </attributes>
         </naming>
         <display_template/>
-        <icon>images/powersource.png</icon>
+        <icon>images/power-connection.png</icon>
         <reconciliation>
           <attributes>
             <attribute id="name"/>
@@ -589,7 +589,7 @@
           </attributes>
         </naming>
         <display_template/>
-        <icon>images/powerstart.png</icon>
+        <icon>images/power-connection.png</icon>
         <reconciliation>
           <attributes>
             <attribute id="name"/>
diff --git a/datamodels/2.x/itop-datacenter-mgmt/images/enclosure.png b/datamodels/2.x/itop-datacenter-mgmt/images/enclosure.png
index e92ca2bee..61ca1f4f1 100755
Binary files a/datamodels/2.x/itop-datacenter-mgmt/images/enclosure.png and b/datamodels/2.x/itop-datacenter-mgmt/images/enclosure.png differ
diff --git a/datamodels/2.x/itop-datacenter-mgmt/images/pdu.png b/datamodels/2.x/itop-datacenter-mgmt/images/pdu.png
index c3255bc4e..079c451b8 100755
Binary files a/datamodels/2.x/itop-datacenter-mgmt/images/pdu.png and b/datamodels/2.x/itop-datacenter-mgmt/images/pdu.png differ
diff --git a/datamodels/2.x/itop-datacenter-mgmt/images/powersource.png b/datamodels/2.x/itop-datacenter-mgmt/images/powersource.png
deleted file mode 100755
index 0bcae204d..000000000
Binary files a/datamodels/2.x/itop-datacenter-mgmt/images/powersource.png and /dev/null differ
diff --git a/datamodels/2.x/itop-datacenter-mgmt/images/powerstart.png b/datamodels/2.x/itop-datacenter-mgmt/images/powerstart.png
deleted file mode 100755
index 733b645ae..000000000
Binary files a/datamodels/2.x/itop-datacenter-mgmt/images/powerstart.png and /dev/null differ
diff --git a/datamodels/2.x/itop-datacenter-mgmt/images/rack.png b/datamodels/2.x/itop-datacenter-mgmt/images/rack.png
index 8210d8805..42afd36ed 100755
Binary files a/datamodels/2.x/itop-datacenter-mgmt/images/rack.png and b/datamodels/2.x/itop-datacenter-mgmt/images/rack.png differ
diff --git a/datamodels/2.x/itop-endusers-devices/images/tablet.png b/datamodels/2.x/itop-endusers-devices/images/tablet.png
index 867f58351..c63140ab1 100755
Binary files a/datamodels/2.x/itop-endusers-devices/images/tablet.png and b/datamodels/2.x/itop-endusers-devices/images/tablet.png differ
diff --git a/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml b/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml
index c47f7b2b0..8dff363b6 100644
--- a/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml
+++ b/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml
@@ -264,7 +264,7 @@
           </attributes>
         </naming>
         <display_template/>
-        <icon>images/switch.png</icon>
+        <icon>images/switch-san.png</icon>
         <reconciliation>
           <attributes>
             <attribute id="name"/>
@@ -1253,7 +1253,7 @@
           </attributes>
         </naming>
         <display_template/>
-        <icon>images/interface.png</icon>
+        <icon>images/fc-interface.png</icon>
         <reconciliation>
           <attributes>
             <attribute id="name"/>
diff --git a/datamodels/2.x/itop-storage-mgmt/images/fc-interface.png b/datamodels/2.x/itop-storage-mgmt/images/fc-interface.png
new file mode 100755
index 000000000..316458643
Binary files /dev/null and b/datamodels/2.x/itop-storage-mgmt/images/fc-interface.png differ
diff --git a/datamodels/2.x/itop-storage-mgmt/images/switch-san.png b/datamodels/2.x/itop-storage-mgmt/images/switch-san.png
new file mode 100755
index 000000000..c602c5e48
Binary files /dev/null and b/datamodels/2.x/itop-storage-mgmt/images/switch-san.png differ
diff --git a/datamodels/2.x/itop-virtualization-mgmt/images/cluster.png b/datamodels/2.x/itop-virtualization-mgmt/images/cluster.png
index 3cff90813..9d3a1115d 100755
Binary files a/datamodels/2.x/itop-virtualization-mgmt/images/cluster.png and b/datamodels/2.x/itop-virtualization-mgmt/images/cluster.png differ
diff --git a/datamodels/2.x/itop-virtualization-mgmt/images/hypervisor.png b/datamodels/2.x/itop-virtualization-mgmt/images/hypervisor.png
index ea0a0b7e8..710f62e8d 100755
Binary files a/datamodels/2.x/itop-virtualization-mgmt/images/hypervisor.png and b/datamodels/2.x/itop-virtualization-mgmt/images/hypervisor.png differ