diff --git a/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml b/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
index 888bcd23b..45f63b23b 100755
--- a/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
+++ b/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
@@ -4641,7 +4641,7 @@
                       AND (C.id != :this->id)
                     ]]></oql>
                   <dict>Tickets:Related:OpenChanges</dict>
-                  <icon>itop-change-mgmt-itil/images/change-ongoing.png</icon>
+                  <icon>itop-change-mgmt-itil/images/change-ongoing.svg</icon>
                 </item>
                 <item id="recent_changes" _delta="define">
                   <oql><![CDATA[
@@ -4656,7 +4656,7 @@
                       AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
                     ]]></oql>
                   <dict>Tickets:Related:RecentChanges</dict>
-                  <icon>itop-change-mgmt-itil/images/change-done.png</icon>
+                  <icon>itop-change-mgmt-itil/images/change-done.svg</icon>
                 </item>
               </items>
             </down>
@@ -4678,7 +4678,7 @@
                       AND (C.id != :this->id)
                     ]]></oql>
                   <dict>Tickets:Related:OpenChanges</dict>
-                  <icon>itop-change-mgmt-itil/images/change-ongoing.png</icon>
+                  <icon>itop-change-mgmt-itil/images/change-ongoing.svg</icon>
                 </item>
                 <item id="recent_changes" _delta="define">
                   <oql><![CDATA[
@@ -4693,7 +4693,7 @@
                       AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
                     ]]></oql>
                   <dict>Tickets:Related:RecentChanges</dict>
-                  <icon>itop-change-mgmt-itil/images/change-done.png</icon>
+                  <icon>itop-change-mgmt-itil/images/change-done.svg</icon>
                 </item>
               </items>
             </down>
@@ -4715,7 +4715,7 @@
                       AND (C.id != :this->id)
                     ]]></oql>
                   <dict>Tickets:Related:OpenChanges</dict>
-                  <icon>itop-change-mgmt-itil/images/change-ongoing.png</icon>
+                  <icon>itop-change-mgmt-itil/images/change-ongoing.svg</icon>
                 </item>
                 <item id="recent_changes" _delta="define">
                   <oql><![CDATA[
@@ -4730,7 +4730,7 @@
                       AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
                     ]]></oql>
                   <dict>Tickets:Related:RecentChanges</dict>
-                  <icon>itop-change-mgmt-itil/images/change-done.png</icon>
+                  <icon>itop-change-mgmt-itil/images/change-done.svg</icon>
                 </item>
               </items>
             </down>
@@ -4755,7 +4755,7 @@
                       AND (L.impact_code != 'not_impacted')
                     ]]></oql>
                   <dict>Tickets:Related:OpenChanges</dict>
-                  <icon>itop-change-mgmt-itil/images/change-ongoing.png</icon>
+                  <icon>itop-change-mgmt-itil/images/change-ongoing.svg</icon>
                 </item>
                 <item id="recent_changes" _delta="define">
                   <oql><![CDATA[
@@ -4769,7 +4769,7 @@
                       AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
                     ]]></oql>
                   <dict>Tickets:Related:RecentChanges</dict>
-                  <icon>itop-change-mgmt-itil/images/change-done.png</icon>
+                  <icon>itop-change-mgmt-itil/images/change-done.svg</icon>
                 </item>
               </items>
             </down>
@@ -4786,7 +4786,7 @@
                       AND (L.impact_code != 'not_impacted')
                     ]]></oql>
                   <dict>Tickets:Related:OpenChanges</dict>
-                  <icon>itop-change-mgmt-itil/images/change-ongoing.png</icon>
+                  <icon>itop-change-mgmt-itil/images/change-ongoing.svg</icon>
                 </item>
                 <item id="recent_changes" _delta="define">
                   <oql><![CDATA[
@@ -4800,7 +4800,7 @@
                       AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
                     ]]></oql>
                   <dict>Tickets:Related:RecentChanges</dict>
-                  <icon>itop-change-mgmt-itil/images/change-done.png</icon>
+                  <icon>itop-change-mgmt-itil/images/change-done.svg</icon>
                 </item>
               </items>
             </up>
diff --git a/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml b/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
index cc5f88ac3..43a0acbb1 100755
--- a/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
+++ b/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
@@ -876,7 +876,7 @@
                                           AND (C.id != :this->id)
                                         ]]></oql>
                   <dict>Tickets:Related:OpenChanges</dict>
-                  <icon>itop-change-mgmt/images/change-ongoing.png</icon>
+                  <icon>itop-change-mgmt/images/change-ongoing.svg</icon>
                   <default>yes</default>
                 </item>
                 <item id="recent_changes" _delta="define">
@@ -892,7 +892,7 @@
                                           AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
                                         ]]></oql>
                   <dict>Tickets:Related:RecentChanges</dict>
-                  <icon>itop-change-mgmt/images/change-done.png</icon>
+                  <icon>itop-change-mgmt/images/change-done.svg</icon>
                   <default>no</default>
                 </item>
               </items>
@@ -915,7 +915,7 @@
                                           AND (C.id != :this->id)
                                         ]]></oql>
                   <dict>Tickets:Related:OpenChanges</dict>
-                  <icon>itop-change-mgmt/images/change-ongoing.png</icon>
+                  <icon>itop-change-mgmt/images/change-ongoing.svg</icon>
                   <default>yes</default>
                 </item>
                 <item id="recent_changes" _delta="define">
@@ -931,7 +931,7 @@
                                           AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
                                         ]]></oql>
                   <dict>Tickets:Related:RecentChanges</dict>
-                  <icon>itop-change-mgmt/images/change-done.png</icon>
+                  <icon>itop-change-mgmt/images/change-done.svg</icon>
                   <default>no</default>
                 </item>
               </items>
@@ -954,7 +954,7 @@
                                           AND (C.id != :this->id)
                                         ]]></oql>
                   <dict>Tickets:Related:OpenChanges</dict>
-                  <icon>itop-change-mgmt/images/change-ongoing.png</icon>
+                  <icon>itop-change-mgmt/images/change-ongoing.svg</icon>
                   <default>yes</default>
                 </item>
                 <item id="recent_changes" _delta="define">
@@ -970,7 +970,7 @@
                                           AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
                                         ]]></oql>
                   <dict>Tickets:Related:RecentChanges</dict>
-                  <icon>itop-change-mgmt/images/change-done.png</icon>
+                  <icon>itop-change-mgmt/images/change-done.svg</icon>
                   <default>no</default>
                 </item>
               </items>
@@ -996,7 +996,7 @@
                                           AND (L.impact_code != 'not_impacted')
                                         ]]></oql>
                   <dict>Tickets:Related:OpenChanges</dict>
-                  <icon>itop-change-mgmt/images/change-ongoing.png</icon>
+                  <icon>itop-change-mgmt/images/change-ongoing.svg</icon>
                   <default>yes</default>
                 </item>
                 <item id="recent_changes" _delta="define">
@@ -1011,7 +1011,7 @@
                                           AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
                                         ]]></oql>
                   <dict>Tickets:Related:RecentChanges</dict>
-                  <icon>itop-change-mgmt/images/change-done.png</icon>
+                  <icon>itop-change-mgmt/images/change-done.svg</icon>
                   <default>no</default>
                 </item>
               </items>
@@ -1029,7 +1029,7 @@
                                           AND (L.impact_code != 'not_impacted')
                                         ]]></oql>
                   <dict>Tickets:Related:OpenChanges</dict>
-                  <icon>itop-change-mgmt/images/change-ongoing.png</icon>
+                  <icon>itop-change-mgmt/images/change-ongoing.svg</icon>
                   <default>yes</default>
                 </item>
                 <item id="recent_changes" _delta="define">
@@ -1044,7 +1044,7 @@
                                           AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
                                         ]]></oql>
                   <dict>Tickets:Related:RecentChanges</dict>
-                  <icon>itop-change-mgmt/images/change-done.png</icon>
+                  <icon>itop-change-mgmt/images/change-done.svg</icon>
                   <default>no</default>
                 </item>
               </items>
diff --git a/datamodels/2.x/itop-change-mgmt/images/change-approved.png b/datamodels/2.x/itop-change-mgmt/images/change-approved.png
deleted file mode 100644
index 35adda5eb..000000000
Binary files a/datamodels/2.x/itop-change-mgmt/images/change-approved.png and /dev/null differ
diff --git a/datamodels/2.x/itop-change-mgmt/images/change-closed.png b/datamodels/2.x/itop-change-mgmt/images/change-closed.png
deleted file mode 100644
index 549cbe306..000000000
Binary files a/datamodels/2.x/itop-change-mgmt/images/change-closed.png and /dev/null differ
diff --git a/datamodels/2.x/itop-change-mgmt/images/change-done.png b/datamodels/2.x/itop-change-mgmt/images/change-done.png
deleted file mode 100644
index f4bdc724c..000000000
Binary files a/datamodels/2.x/itop-change-mgmt/images/change-done.png and /dev/null differ
diff --git a/datamodels/2.x/itop-change-mgmt/images/change-ongoing.png b/datamodels/2.x/itop-change-mgmt/images/change-ongoing.png
deleted file mode 100644
index 3fbddb0e0..000000000
Binary files a/datamodels/2.x/itop-change-mgmt/images/change-ongoing.png and /dev/null differ
diff --git a/datamodels/2.x/itop-change-mgmt/images/change-rejected.png b/datamodels/2.x/itop-change-mgmt/images/change-rejected.png
deleted file mode 100644
index 8f2d46d12..000000000
Binary files a/datamodels/2.x/itop-change-mgmt/images/change-rejected.png and /dev/null differ
diff --git a/datamodels/2.x/itop-change-mgmt/images/change.png b/datamodels/2.x/itop-change-mgmt/images/change.png
deleted file mode 100644
index 51e9a92ed..000000000
Binary files a/datamodels/2.x/itop-change-mgmt/images/change.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/application.png b/datamodels/2.x/itop-config-mgmt/images/application.png
deleted file mode 100755
index f1512d137..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/application.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/applicationservice.png b/datamodels/2.x/itop-config-mgmt/images/applicationservice.png
deleted file mode 100755
index 62348ebdf..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/applicationservice.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/building.png b/datamodels/2.x/itop-config-mgmt/images/building.png
deleted file mode 100755
index 94fdeae82..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/building.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/business-process.png b/datamodels/2.x/itop-config-mgmt/images/business-process.png
deleted file mode 100755
index a2359860f..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/business-process.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/computer.png b/datamodels/2.x/itop-config-mgmt/images/computer.png
deleted file mode 100755
index 2e88eacb3..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/computer.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/contact.png b/datamodels/2.x/itop-config-mgmt/images/contact.png
deleted file mode 100755
index 0694d18f9..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/contact.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/database-instance.png b/datamodels/2.x/itop-config-mgmt/images/database-instance.png
deleted file mode 100755
index 634895539..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/database-instance.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/database-schema.png b/datamodels/2.x/itop-config-mgmt/images/database-schema.png
deleted file mode 100755
index 415dd78e0..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/database-schema.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/database.png b/datamodels/2.x/itop-config-mgmt/images/database.png
deleted file mode 100755
index 1c5a2e039..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/database.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/diskarray.png b/datamodels/2.x/itop-config-mgmt/images/diskarray.png
deleted file mode 100755
index ae6e1d8d7..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/diskarray.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/document.png b/datamodels/2.x/itop-config-mgmt/images/document.png
deleted file mode 100755
index 04de88f8f..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/document.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/group.png b/datamodels/2.x/itop-config-mgmt/images/group.png
deleted file mode 100755
index 894d1485e..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/group.png 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
deleted file mode 100755
index 8aa046405..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/interface.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/licence.png b/datamodels/2.x/itop-config-mgmt/images/licence.png
deleted file mode 100755
index bd9e4d79a..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/licence.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/location.png b/datamodels/2.x/itop-config-mgmt/images/location.png
deleted file mode 100755
index 529a4516e..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/location.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/middleware.png b/datamodels/2.x/itop-config-mgmt/images/middleware.png
deleted file mode 100755
index 0a0499e81..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/middleware.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/patch.png b/datamodels/2.x/itop-config-mgmt/images/patch.png
deleted file mode 100755
index 42b383020..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/patch.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/person.png b/datamodels/2.x/itop-config-mgmt/images/person.png
deleted file mode 100755
index ff8313e79..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/person.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/printer.png b/datamodels/2.x/itop-config-mgmt/images/printer.png
deleted file mode 100755
index 24bcb9678..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/printer.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/server.png b/datamodels/2.x/itop-config-mgmt/images/server.png
deleted file mode 100755
index 9a70caace..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/server.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/silhouette.png b/datamodels/2.x/itop-config-mgmt/images/silhouette.png
deleted file mode 100644
index 5fc2548d9..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/silhouette.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/software.png b/datamodels/2.x/itop-config-mgmt/images/software.png
deleted file mode 100755
index 4f629eaf3..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/software.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/solution.png b/datamodels/2.x/itop-config-mgmt/images/solution.png
deleted file mode 100755
index bc9bc4547..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/solution.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/subnet.png b/datamodels/2.x/itop-config-mgmt/images/subnet.png
deleted file mode 100755
index 9af036d3b..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/subnet.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/switch.png b/datamodels/2.x/itop-config-mgmt/images/switch.png
deleted file mode 100755
index 1df637fa9..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/switch.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/team.png b/datamodels/2.x/itop-config-mgmt/images/team.png
deleted file mode 100755
index 329be879d..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/team.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/typology.png b/datamodels/2.x/itop-config-mgmt/images/typology.png
deleted file mode 100755
index 35bae8187..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/typology.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/vlan.png b/datamodels/2.x/itop-config-mgmt/images/vlan.png
deleted file mode 100755
index f690b2f5d..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/vlan.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/volume.png b/datamodels/2.x/itop-config-mgmt/images/volume.png
deleted file mode 100755
index cc3540912..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/volume.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/webapp.png b/datamodels/2.x/itop-config-mgmt/images/webapp.png
deleted file mode 100755
index 3506f6c07..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/webapp.png and /dev/null differ
diff --git a/datamodels/2.x/itop-config-mgmt/images/webserver.png b/datamodels/2.x/itop-config-mgmt/images/webserver.png
deleted file mode 100755
index 8d9cf43dd..000000000
Binary files a/datamodels/2.x/itop-config-mgmt/images/webserver.png and /dev/null differ
diff --git a/datamodels/2.x/itop-datacenter-mgmt/images/enclosure.png b/datamodels/2.x/itop-datacenter-mgmt/images/enclosure.png
deleted file mode 100755
index 61ca1f4f1..000000000
Binary files a/datamodels/2.x/itop-datacenter-mgmt/images/enclosure.png and /dev/null differ
diff --git a/datamodels/2.x/itop-datacenter-mgmt/images/pdu.png b/datamodels/2.x/itop-datacenter-mgmt/images/pdu.png
deleted file mode 100755
index 079c451b8..000000000
Binary files a/datamodels/2.x/itop-datacenter-mgmt/images/pdu.png and /dev/null differ
diff --git a/datamodels/2.x/itop-datacenter-mgmt/images/power-connection.png b/datamodels/2.x/itop-datacenter-mgmt/images/power-connection.png
deleted file mode 100755
index 349584c89..000000000
Binary files a/datamodels/2.x/itop-datacenter-mgmt/images/power-connection.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
deleted file mode 100755
index 42afd36ed..000000000
Binary files a/datamodels/2.x/itop-datacenter-mgmt/images/rack.png and /dev/null differ
diff --git a/datamodels/2.x/itop-endusers-devices/images/ipphone.png b/datamodels/2.x/itop-endusers-devices/images/ipphone.png
deleted file mode 100755
index 114afd4e6..000000000
Binary files a/datamodels/2.x/itop-endusers-devices/images/ipphone.png and /dev/null differ
diff --git a/datamodels/2.x/itop-endusers-devices/images/laptop.png b/datamodels/2.x/itop-endusers-devices/images/laptop.png
deleted file mode 100755
index 9cce218db..000000000
Binary files a/datamodels/2.x/itop-endusers-devices/images/laptop.png and /dev/null differ
diff --git a/datamodels/2.x/itop-endusers-devices/images/mobile-phone.png b/datamodels/2.x/itop-endusers-devices/images/mobile-phone.png
deleted file mode 100755
index 545b84346..000000000
Binary files a/datamodels/2.x/itop-endusers-devices/images/mobile-phone.png and /dev/null differ
diff --git a/datamodels/2.x/itop-endusers-devices/images/peripherals.png b/datamodels/2.x/itop-endusers-devices/images/peripherals.png
deleted file mode 100755
index 9d7a3f5cd..000000000
Binary files a/datamodels/2.x/itop-endusers-devices/images/peripherals.png and /dev/null differ
diff --git a/datamodels/2.x/itop-endusers-devices/images/phone.png b/datamodels/2.x/itop-endusers-devices/images/phone.png
deleted file mode 100755
index 44ec25ad7..000000000
Binary files a/datamodels/2.x/itop-endusers-devices/images/phone.png and /dev/null differ
diff --git a/datamodels/2.x/itop-endusers-devices/images/printer.png b/datamodels/2.x/itop-endusers-devices/images/printer.png
deleted file mode 100755
index 24bcb9678..000000000
Binary files a/datamodels/2.x/itop-endusers-devices/images/printer.png and /dev/null differ
diff --git a/datamodels/2.x/itop-endusers-devices/images/tablet.png b/datamodels/2.x/itop-endusers-devices/images/tablet.png
deleted file mode 100755
index c63140ab1..000000000
Binary files a/datamodels/2.x/itop-endusers-devices/images/tablet.png and /dev/null differ
diff --git a/datamodels/2.x/itop-faq-light/images/faq.png b/datamodels/2.x/itop-faq-light/images/faq.png
deleted file mode 100755
index 010d7dbe2..000000000
Binary files a/datamodels/2.x/itop-faq-light/images/faq.png and /dev/null differ
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
index 72429b043..94125ce4b 100755
--- a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
+++ b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
@@ -1860,7 +1860,7 @@
 										  AND (I.id != :this->id)
 										]]></oql>
                   <dict>Tickets:Related:OpenIncidents</dict>
-                  <icon>itop-incident-mgmt-itil/images/incident-red.png</icon>
+                  <icon>itop-incident-mgmt-itil/images/incident-red.svg</icon>
                   <default>yes</default>
                 </item>
               </items>
@@ -1882,7 +1882,7 @@
 										  AND (I.id != :this->id)
 										]]></oql>
                   <dict>Tickets:Related:OpenIncidents</dict>
-                  <icon>itop-incident-mgmt-itil/images/incident-red.png</icon>
+                  <icon>itop-incident-mgmt-itil/images/incident-red.svg</icon>
                   <default>yes</default>
                 </item>
               </items>
@@ -1904,7 +1904,7 @@
 										  AND (I.id != :this->id)
 										]]></oql>
                   <dict>Tickets:Related:OpenIncidents</dict>
-                  <icon>itop-incident-mgmt-itil/images/incident-red.png</icon>
+                  <icon>itop-incident-mgmt-itil/images/incident-red.svg</icon>
                   <default>yes</default>
                 </item>
               </items>
@@ -1929,7 +1929,7 @@
 										  AND (L.impact_code != 'not_impacted')
 										]]></oql>
                   <dict>Tickets:Related:OpenIncidents</dict>
-                  <icon>itop-incident-mgmt-itil/images/incident-red.png</icon>
+                  <icon>itop-incident-mgmt-itil/images/incident-red.dvg</icon>
                   <default>yes</default>
                 </item>
               </items>
@@ -1946,7 +1946,7 @@
 										  AND (L.impact_code != 'not_impacted')
 										]]></oql>
                   <dict>Tickets:Related:OpenIncidents</dict>
-                  <icon>itop-incident-mgmt-itil/images/incident-red.png</icon>
+                  <icon>itop-incident-mgmt-itil/images/incident-red.svg</icon>
                   <default>yes</default>
                 </item>
               </items>
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/images/incident-closed.png b/datamodels/2.x/itop-incident-mgmt-itil/images/incident-closed.png
deleted file mode 100644
index 1c1737e86..000000000
Binary files a/datamodels/2.x/itop-incident-mgmt-itil/images/incident-closed.png and /dev/null differ
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/images/incident-deadline.png b/datamodels/2.x/itop-incident-mgmt-itil/images/incident-deadline.png
deleted file mode 100644
index bdc84e175..000000000
Binary files a/datamodels/2.x/itop-incident-mgmt-itil/images/incident-deadline.png and /dev/null differ
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/images/incident-escalated.png b/datamodels/2.x/itop-incident-mgmt-itil/images/incident-escalated.png
deleted file mode 100644
index dc65fdc63..000000000
Binary files a/datamodels/2.x/itop-incident-mgmt-itil/images/incident-escalated.png and /dev/null differ
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/images/incident-red.png b/datamodels/2.x/itop-incident-mgmt-itil/images/incident-red.png
deleted file mode 100644
index 6ad9fe893..000000000
Binary files a/datamodels/2.x/itop-incident-mgmt-itil/images/incident-red.png and /dev/null differ
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/images/incident.png b/datamodels/2.x/itop-incident-mgmt-itil/images/incident.png
deleted file mode 100644
index e1d9fd380..000000000
Binary files a/datamodels/2.x/itop-incident-mgmt-itil/images/incident.png and /dev/null differ
diff --git a/datamodels/2.x/itop-knownerror-mgmt/images/known-error.png b/datamodels/2.x/itop-knownerror-mgmt/images/known-error.png
deleted file mode 100755
index 0871dfbc0..000000000
Binary files a/datamodels/2.x/itop-knownerror-mgmt/images/known-error.png and /dev/null differ
diff --git a/datamodels/2.x/itop-problem-mgmt/images/problem.png b/datamodels/2.x/itop-problem-mgmt/images/problem.png
deleted file mode 100755
index bcf47a850..000000000
Binary files a/datamodels/2.x/itop-problem-mgmt/images/problem.png and /dev/null differ
diff --git a/datamodels/2.x/itop-request-mgmt-itil/images/user-request-closed.png b/datamodels/2.x/itop-request-mgmt-itil/images/user-request-closed.png
deleted file mode 100644
index fbc7e680e..000000000
Binary files a/datamodels/2.x/itop-request-mgmt-itil/images/user-request-closed.png and /dev/null differ
diff --git a/datamodels/2.x/itop-request-mgmt-itil/images/user-request-deadline.png b/datamodels/2.x/itop-request-mgmt-itil/images/user-request-deadline.png
deleted file mode 100644
index 0e3f7e731..000000000
Binary files a/datamodels/2.x/itop-request-mgmt-itil/images/user-request-deadline.png and /dev/null differ
diff --git a/datamodels/2.x/itop-request-mgmt-itil/images/user-request-escalated.png b/datamodels/2.x/itop-request-mgmt-itil/images/user-request-escalated.png
deleted file mode 100644
index 1ea610ad2..000000000
Binary files a/datamodels/2.x/itop-request-mgmt-itil/images/user-request-escalated.png and /dev/null differ
diff --git a/datamodels/2.x/itop-request-mgmt-itil/images/user-request.png b/datamodels/2.x/itop-request-mgmt-itil/images/user-request.png
deleted file mode 100644
index 377fcd1ab..000000000
Binary files a/datamodels/2.x/itop-request-mgmt-itil/images/user-request.png and /dev/null differ
diff --git a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
index 6bebfd7fa..2d7396f66 100755
--- a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
+++ b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
@@ -2049,7 +2049,7 @@
                                           AND (R.id != :this->id)
                                         ]]></oql>
                   <dict>Tickets:Related:OpenIncidents</dict>
-                  <icon>itop-request-mgmt/images/incident-red.png</icon>
+                  <icon>itop-request-mgmt/images/incident-red.svg</icon>
                   <default>yes</default>
                 </item>
               </items>
@@ -2072,7 +2072,7 @@
                                           AND (R.id != :this->id)
                                         ]]></oql>
                   <dict>Tickets:Related:OpenIncidents</dict>
-                  <icon>itop-request-mgmt/images/incident-red.png</icon>
+                  <icon>itop-request-mgmt/images/incident-red.svg</icon>
                   <default>yes</default>
                 </item>
               </items>
@@ -2098,7 +2098,7 @@
                                           AND (L.impact_code != 'not_impacted')
                                         ]]></oql>
                   <dict>Tickets:Related:OpenIncidents</dict>
-                  <icon>itop-request-mgmt/images/incident-red.png</icon>
+                  <icon>itop-request-mgmt/images/incident-red.svg</icon>
                   <default>yes</default>
                 </item>
               </items>
@@ -2116,7 +2116,7 @@
                                           AND (L.impact_code != 'not_impacted')
                                         ]]></oql>
                   <dict>Tickets:Related:OpenIncidents</dict>
-                  <icon>itop-request-mgmt/images/incident-red.png</icon>
+                  <icon>itop-request-mgmt/images/incident-red.svg</icon>
                   <default>yes</default>
                 </item>
               </items>
diff --git a/datamodels/2.x/itop-request-mgmt/images/incident-red.png b/datamodels/2.x/itop-request-mgmt/images/incident-red.png
deleted file mode 100755
index b1a825ec1..000000000
Binary files a/datamodels/2.x/itop-request-mgmt/images/incident-red.png and /dev/null differ
diff --git a/datamodels/2.x/itop-request-mgmt/images/user-request-closed.png b/datamodels/2.x/itop-request-mgmt/images/user-request-closed.png
deleted file mode 100644
index fbc7e680e..000000000
Binary files a/datamodels/2.x/itop-request-mgmt/images/user-request-closed.png and /dev/null differ
diff --git a/datamodels/2.x/itop-request-mgmt/images/user-request-deadline.png b/datamodels/2.x/itop-request-mgmt/images/user-request-deadline.png
deleted file mode 100644
index 0e3f7e731..000000000
Binary files a/datamodels/2.x/itop-request-mgmt/images/user-request-deadline.png and /dev/null differ
diff --git a/datamodels/2.x/itop-request-mgmt/images/user-request-escalated.png b/datamodels/2.x/itop-request-mgmt/images/user-request-escalated.png
deleted file mode 100644
index 1ea610ad2..000000000
Binary files a/datamodels/2.x/itop-request-mgmt/images/user-request-escalated.png and /dev/null differ
diff --git a/datamodels/2.x/itop-request-mgmt/images/user-request.png b/datamodels/2.x/itop-request-mgmt/images/user-request.png
deleted file mode 100644
index 377fcd1ab..000000000
Binary files a/datamodels/2.x/itop-request-mgmt/images/user-request.png and /dev/null differ
diff --git a/datamodels/2.x/itop-service-mgmt-provider/images/contract.png b/datamodels/2.x/itop-service-mgmt-provider/images/contract.png
deleted file mode 100755
index faf2d1ec7..000000000
Binary files a/datamodels/2.x/itop-service-mgmt-provider/images/contract.png and /dev/null differ
diff --git a/datamodels/2.x/itop-service-mgmt-provider/images/service.png b/datamodels/2.x/itop-service-mgmt-provider/images/service.png
deleted file mode 100755
index 135fd11b9..000000000
Binary files a/datamodels/2.x/itop-service-mgmt-provider/images/service.png and /dev/null differ
diff --git a/datamodels/2.x/itop-service-mgmt-provider/images/sla.png b/datamodels/2.x/itop-service-mgmt-provider/images/sla.png
deleted file mode 100755
index 0542b0fc9..000000000
Binary files a/datamodels/2.x/itop-service-mgmt-provider/images/sla.png and /dev/null differ
diff --git a/datamodels/2.x/itop-service-mgmt-provider/images/slt.png b/datamodels/2.x/itop-service-mgmt-provider/images/slt.png
deleted file mode 100755
index d63a9cc63..000000000
Binary files a/datamodels/2.x/itop-service-mgmt-provider/images/slt.png and /dev/null differ
diff --git a/datamodels/2.x/itop-service-mgmt/contract.png b/datamodels/2.x/itop-service-mgmt/contract.png
deleted file mode 100755
index 8755c1754..000000000
Binary files a/datamodels/2.x/itop-service-mgmt/contract.png and /dev/null differ
diff --git a/datamodels/2.x/itop-service-mgmt/images/contract.png b/datamodels/2.x/itop-service-mgmt/images/contract.png
deleted file mode 100755
index 8f7314b6d..000000000
Binary files a/datamodels/2.x/itop-service-mgmt/images/contract.png and /dev/null differ
diff --git a/datamodels/2.x/itop-service-mgmt/images/service.png b/datamodels/2.x/itop-service-mgmt/images/service.png
deleted file mode 100755
index 135fd11b9..000000000
Binary files a/datamodels/2.x/itop-service-mgmt/images/service.png and /dev/null differ
diff --git a/datamodels/2.x/itop-service-mgmt/images/sla.png b/datamodels/2.x/itop-service-mgmt/images/sla.png
deleted file mode 100755
index 0542b0fc9..000000000
Binary files a/datamodels/2.x/itop-service-mgmt/images/sla.png and /dev/null differ
diff --git a/datamodels/2.x/itop-service-mgmt/images/slt.png b/datamodels/2.x/itop-service-mgmt/images/slt.png
deleted file mode 100755
index d63a9cc63..000000000
Binary files a/datamodels/2.x/itop-service-mgmt/images/slt.png and /dev/null differ
diff --git a/datamodels/2.x/itop-storage-mgmt/images/diskarray.png b/datamodels/2.x/itop-storage-mgmt/images/diskarray.png
deleted file mode 100755
index 00e8c3642..000000000
Binary files a/datamodels/2.x/itop-storage-mgmt/images/diskarray.png and /dev/null differ
diff --git a/datamodels/2.x/itop-storage-mgmt/images/fc-interface.png b/datamodels/2.x/itop-storage-mgmt/images/fc-interface.png
deleted file mode 100755
index 316458643..000000000
Binary files a/datamodels/2.x/itop-storage-mgmt/images/fc-interface.png and /dev/null differ
diff --git a/datamodels/2.x/itop-storage-mgmt/images/filesystem.png b/datamodels/2.x/itop-storage-mgmt/images/filesystem.png
deleted file mode 100755
index d09c4003d..000000000
Binary files a/datamodels/2.x/itop-storage-mgmt/images/filesystem.png and /dev/null differ
diff --git a/datamodels/2.x/itop-storage-mgmt/images/interface.png b/datamodels/2.x/itop-storage-mgmt/images/interface.png
deleted file mode 100755
index 63800057f..000000000
Binary files a/datamodels/2.x/itop-storage-mgmt/images/interface.png and /dev/null differ
diff --git a/datamodels/2.x/itop-storage-mgmt/images/nas.png b/datamodels/2.x/itop-storage-mgmt/images/nas.png
deleted file mode 100755
index 1db7310ed..000000000
Binary files a/datamodels/2.x/itop-storage-mgmt/images/nas.png and /dev/null differ
diff --git a/datamodels/2.x/itop-storage-mgmt/images/storageArea.png b/datamodels/2.x/itop-storage-mgmt/images/storageArea.png
deleted file mode 100755
index 2d4faa625..000000000
Binary files a/datamodels/2.x/itop-storage-mgmt/images/storageArea.png and /dev/null 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
deleted file mode 100755
index c602c5e48..000000000
Binary files a/datamodels/2.x/itop-storage-mgmt/images/switch-san.png and /dev/null differ
diff --git a/datamodels/2.x/itop-storage-mgmt/images/switch.png b/datamodels/2.x/itop-storage-mgmt/images/switch.png
deleted file mode 100755
index 5d8c49354..000000000
Binary files a/datamodels/2.x/itop-storage-mgmt/images/switch.png and /dev/null differ
diff --git a/datamodels/2.x/itop-storage-mgmt/images/tape.png b/datamodels/2.x/itop-storage-mgmt/images/tape.png
deleted file mode 100755
index c0174207e..000000000
Binary files a/datamodels/2.x/itop-storage-mgmt/images/tape.png and /dev/null differ
diff --git a/datamodels/2.x/itop-storage-mgmt/images/tapelibrary.png b/datamodels/2.x/itop-storage-mgmt/images/tapelibrary.png
deleted file mode 100755
index a20628d4c..000000000
Binary files a/datamodels/2.x/itop-storage-mgmt/images/tapelibrary.png and /dev/null differ
diff --git a/datamodels/2.x/itop-storage-mgmt/images/volume.png b/datamodels/2.x/itop-storage-mgmt/images/volume.png
deleted file mode 100755
index cc3540912..000000000
Binary files a/datamodels/2.x/itop-storage-mgmt/images/volume.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/application.png b/datamodels/2.x/itop-structure/images/application.png
deleted file mode 100644
index f1512d137..000000000
Binary files a/datamodels/2.x/itop-structure/images/application.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/applicationservice.png b/datamodels/2.x/itop-structure/images/applicationservice.png
deleted file mode 100644
index 62348ebdf..000000000
Binary files a/datamodels/2.x/itop-structure/images/applicationservice.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/building.png b/datamodels/2.x/itop-structure/images/building.png
deleted file mode 100644
index 94fdeae82..000000000
Binary files a/datamodels/2.x/itop-structure/images/building.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/business-process.png b/datamodels/2.x/itop-structure/images/business-process.png
deleted file mode 100644
index a2359860f..000000000
Binary files a/datamodels/2.x/itop-structure/images/business-process.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/computer.png b/datamodels/2.x/itop-structure/images/computer.png
deleted file mode 100644
index 2e88eacb3..000000000
Binary files a/datamodels/2.x/itop-structure/images/computer.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/contact.png b/datamodels/2.x/itop-structure/images/contact.png
deleted file mode 100644
index 0694d18f9..000000000
Binary files a/datamodels/2.x/itop-structure/images/contact.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/database-instance.png b/datamodels/2.x/itop-structure/images/database-instance.png
deleted file mode 100644
index 634895539..000000000
Binary files a/datamodels/2.x/itop-structure/images/database-instance.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/database-schema.png b/datamodels/2.x/itop-structure/images/database-schema.png
deleted file mode 100644
index 415dd78e0..000000000
Binary files a/datamodels/2.x/itop-structure/images/database-schema.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/database.png b/datamodels/2.x/itop-structure/images/database.png
deleted file mode 100644
index 1c5a2e039..000000000
Binary files a/datamodels/2.x/itop-structure/images/database.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/diskarray.png b/datamodels/2.x/itop-structure/images/diskarray.png
deleted file mode 100644
index ae6e1d8d7..000000000
Binary files a/datamodels/2.x/itop-structure/images/diskarray.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/document.png b/datamodels/2.x/itop-structure/images/document.png
deleted file mode 100644
index 04de88f8f..000000000
Binary files a/datamodels/2.x/itop-structure/images/document.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/group.png b/datamodels/2.x/itop-structure/images/group.png
deleted file mode 100644
index 894d1485e..000000000
Binary files a/datamodels/2.x/itop-structure/images/group.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/incident-escalated.png b/datamodels/2.x/itop-structure/images/incident-escalated.png
deleted file mode 100644
index dc65fdc63..000000000
Binary files a/datamodels/2.x/itop-structure/images/incident-escalated.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/interface.png b/datamodels/2.x/itop-structure/images/interface.png
deleted file mode 100644
index 8aa046405..000000000
Binary files a/datamodels/2.x/itop-structure/images/interface.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/licence.png b/datamodels/2.x/itop-structure/images/licence.png
deleted file mode 100644
index bd9e4d79a..000000000
Binary files a/datamodels/2.x/itop-structure/images/licence.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/location.png b/datamodels/2.x/itop-structure/images/location.png
deleted file mode 100644
index 529a4516e..000000000
Binary files a/datamodels/2.x/itop-structure/images/location.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/middleware.png b/datamodels/2.x/itop-structure/images/middleware.png
deleted file mode 100644
index 0a0499e81..000000000
Binary files a/datamodels/2.x/itop-structure/images/middleware.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/patch.png b/datamodels/2.x/itop-structure/images/patch.png
deleted file mode 100644
index 42b383020..000000000
Binary files a/datamodels/2.x/itop-structure/images/patch.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/person.png b/datamodels/2.x/itop-structure/images/person.png
deleted file mode 100644
index ff8313e79..000000000
Binary files a/datamodels/2.x/itop-structure/images/person.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/printer.png b/datamodels/2.x/itop-structure/images/printer.png
deleted file mode 100644
index 24bcb9678..000000000
Binary files a/datamodels/2.x/itop-structure/images/printer.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/server.png b/datamodels/2.x/itop-structure/images/server.png
deleted file mode 100644
index 9a70caace..000000000
Binary files a/datamodels/2.x/itop-structure/images/server.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/software.png b/datamodels/2.x/itop-structure/images/software.png
deleted file mode 100644
index 4f629eaf3..000000000
Binary files a/datamodels/2.x/itop-structure/images/software.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/solution.png b/datamodels/2.x/itop-structure/images/solution.png
deleted file mode 100644
index bc9bc4547..000000000
Binary files a/datamodels/2.x/itop-structure/images/solution.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/subnet.png b/datamodels/2.x/itop-structure/images/subnet.png
deleted file mode 100644
index 9af036d3b..000000000
Binary files a/datamodels/2.x/itop-structure/images/subnet.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/switch.png b/datamodels/2.x/itop-structure/images/switch.png
deleted file mode 100644
index 1df637fa9..000000000
Binary files a/datamodels/2.x/itop-structure/images/switch.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/team.png b/datamodels/2.x/itop-structure/images/team.png
deleted file mode 100644
index 329be879d..000000000
Binary files a/datamodels/2.x/itop-structure/images/team.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/typology.png b/datamodels/2.x/itop-structure/images/typology.png
deleted file mode 100644
index 35bae8187..000000000
Binary files a/datamodels/2.x/itop-structure/images/typology.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/vlan.png b/datamodels/2.x/itop-structure/images/vlan.png
deleted file mode 100644
index f690b2f5d..000000000
Binary files a/datamodels/2.x/itop-structure/images/vlan.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/volume.png b/datamodels/2.x/itop-structure/images/volume.png
deleted file mode 100644
index cc3540912..000000000
Binary files a/datamodels/2.x/itop-structure/images/volume.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/webapp.png b/datamodels/2.x/itop-structure/images/webapp.png
deleted file mode 100644
index 3506f6c07..000000000
Binary files a/datamodels/2.x/itop-structure/images/webapp.png and /dev/null differ
diff --git a/datamodels/2.x/itop-structure/images/webserver.png b/datamodels/2.x/itop-structure/images/webserver.png
deleted file mode 100644
index 8d9cf43dd..000000000
Binary files a/datamodels/2.x/itop-structure/images/webserver.png and /dev/null differ
diff --git a/datamodels/2.x/itop-tickets/images/workorder.png b/datamodels/2.x/itop-tickets/images/workorder.png
deleted file mode 100644
index d8ffc3d30..000000000
Binary files a/datamodels/2.x/itop-tickets/images/workorder.png and /dev/null differ
diff --git a/datamodels/2.x/itop-virtualization-mgmt/images/cluster.png b/datamodels/2.x/itop-virtualization-mgmt/images/cluster.png
deleted file mode 100755
index 9d3a1115d..000000000
Binary files a/datamodels/2.x/itop-virtualization-mgmt/images/cluster.png and /dev/null differ
diff --git a/datamodels/2.x/itop-virtualization-mgmt/images/hypervisor-sw.png b/datamodels/2.x/itop-virtualization-mgmt/images/hypervisor-sw.png
deleted file mode 100755
index a3fabd3c7..000000000
Binary files a/datamodels/2.x/itop-virtualization-mgmt/images/hypervisor-sw.png and /dev/null differ
diff --git a/datamodels/2.x/itop-virtualization-mgmt/images/hypervisor.png b/datamodels/2.x/itop-virtualization-mgmt/images/hypervisor.png
deleted file mode 100755
index 710f62e8d..000000000
Binary files a/datamodels/2.x/itop-virtualization-mgmt/images/hypervisor.png and /dev/null differ
diff --git a/datamodels/2.x/itop-virtualization-mgmt/images/interface.png b/datamodels/2.x/itop-virtualization-mgmt/images/interface.png
deleted file mode 100755
index 63800057f..000000000
Binary files a/datamodels/2.x/itop-virtualization-mgmt/images/interface.png and /dev/null differ
diff --git a/datamodels/2.x/itop-virtualization-mgmt/images/virtualmachine.png b/datamodels/2.x/itop-virtualization-mgmt/images/virtualmachine.png
deleted file mode 100755
index e9f2422dc..000000000
Binary files a/datamodels/2.x/itop-virtualization-mgmt/images/virtualmachine.png and /dev/null differ
diff --git a/datamodels/2.x/itop-virtualization-mgmt/images/vlan.png b/datamodels/2.x/itop-virtualization-mgmt/images/vlan.png
deleted file mode 100755
index f690b2f5d..000000000
Binary files a/datamodels/2.x/itop-virtualization-mgmt/images/vlan.png and /dev/null differ
diff --git a/datamodels/2.x/itop-welcome-itil/images/database.png b/datamodels/2.x/itop-welcome-itil/images/database.png
deleted file mode 100755
index 1c5a2e039..000000000
Binary files a/datamodels/2.x/itop-welcome-itil/images/database.png and /dev/null differ
diff --git a/datamodels/2.x/itop-welcome-itil/images/user-request-deadline.png b/datamodels/2.x/itop-welcome-itil/images/user-request-deadline.png
deleted file mode 100755
index 1fb42ec00..000000000
Binary files a/datamodels/2.x/itop-welcome-itil/images/user-request-deadline.png and /dev/null differ
diff --git a/tests/php-unit-tests/unitary-tests/core/ormStyleTest.php b/tests/php-unit-tests/unitary-tests/core/ormStyleTest.php
index 7424a86da..867ad4c8d 100644
--- a/tests/php-unit-tests/unitary-tests/core/ormStyleTest.php
+++ b/tests/php-unit-tests/unitary-tests/core/ormStyleTest.php
@@ -289,7 +289,7 @@ class ormStyleTest extends ItopTestCase
 				'#ABCDEF',
 				'#123456',
 				'fas fa-user',
-				'images/user-request.png',
+				'images/user-request.svg',
 			],
 			'Style with empty icon path' => [
 				'regular-class',
diff --git a/tests/php-unit-tests/unitary-tests/setup/unattended-install/resources/installation.xml b/tests/php-unit-tests/unitary-tests/setup/unattended-install/resources/installation.xml
index 89f2a212e..b357dc712 100644
--- a/tests/php-unit-tests/unitary-tests/setup/unattended-install/resources/installation.xml
+++ b/tests/php-unit-tests/unitary-tests/setup/unattended-install/resources/installation.xml
@@ -89,7 +89,7 @@
     <step>
       <title>Tickets Management options</title>
       <description><![CDATA[<h2>Select the type of tickets you want to use in order to respond to user requests and incidents.</h2>]]></description>
-      <banner>./itop-incident-mgmt-itil/images/incident-escalated.png</banner>
+      <banner>./itop-incident-mgmt-itil/images/incident-escalated.svg</banner>
       <alternatives type="array">
         <choice>
           <extension_code>itop-ticket-mgmt-simple-ticket</extension_code>
@@ -161,7 +161,7 @@
     <step>
       <title>Change Management options</title>
       <description><![CDATA[<h2>Select the type of tickets you want to use in order to manage changes to the IT infrastructure.</h2>]]></description>
-      <banner>./itop-change-mgmt/images/change.png</banner>
+      <banner>./itop-change-mgmt/images/change.svg</banner>
       <alternatives type="array">
         <choice>
           <extension_code>itop-change-mgmt-simple</extension_code>
@@ -192,7 +192,7 @@
     <step>
       <title>Additional ITIL tickets</title>
       <description><![CDATA[<h2>Pick from the list below the additional ITIL processes that are to be implemented in iTop.</h2>]]></description>
-      <banner>./itop-knownerror-mgmt/images/known-error.png</banner>
+      <banner>./itop-knownerror-mgmt/images/known-error.svg</banner>
       <options type="array">
         <choice>
           <extension_code>itop-kown-error-mgmt</extension_code>