diff --git a/datamodels/2.x/itop-attachments/icons/icons8-archive-folder.svg b/datamodels/2.x/itop-attachments/icons/icons8-archive-folder.svg
new file mode 100644
index 0000000000..7c1aa9c90b
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-archive-folder.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="500px" height="500px"><linearGradient id="bwc2gTApiQRdrgZvACv8Ha" x1="24" x2="24" y1="6.708" y2="14.977" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#eba600"/><stop offset="1" stop-color="#c28200"/></linearGradient><path fill="url(#bwc2gTApiQRdrgZvACv8Ha)" d="M24.414,10.414l-2.536-2.536C21.316,7.316,20.553,7,19.757,7L5,7C3.895,7,3,7.895,3,9l0,30	c0,1.105,0.895,2,2,2l38,0c1.105,0,2-0.895,2-2V13c0-1.105-0.895-2-2-2l-17.172,0C25.298,11,24.789,10.789,24.414,10.414z"/><linearGradient id="bwc2gTApiQRdrgZvACv8Hb" x1="24" x2="24" y1="10.854" y2="40.983" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffd869"/><stop offset="1" stop-color="#fec52b"/></linearGradient><path fill="url(#bwc2gTApiQRdrgZvACv8Hb)" d="M21.586,14.414l3.268-3.268C24.947,11.053,25.074,11,25.207,11H43c1.105,0,2,0.895,2,2v26	c0,1.105-0.895,2-2,2H5c-1.105,0-2-0.895-2-2V15.5C3,15.224,3.224,15,3.5,15h16.672C20.702,15,21.211,14.789,21.586,14.414z"/><path fill="#c28200" d="M36,11.5v1c0,0.276-0.224,0.5-0.5,0.5H34c-0.552,0-1-0.448-1-1c0-0.552,0.448-1,1-1h1.5	C35.776,11,36,11.224,36,11.5z M34,14c0-0.552-0.448-1-1-1h-1.5c-0.276,0-0.5,0.224-0.5,0.5v1c0,0.276,0.224,0.5,0.5,0.5H33	C33.552,15,34,14.552,34,14z M33,16c0,0.552,0.448,1,1,1h1.5c0.276,0,0.5-0.224,0.5-0.5v-1c0-0.276-0.224-0.5-0.5-0.5H34	C33.448,15,33,15.448,33,16z M34,18c0-0.552-0.448-1-1-1h-1.5c-0.276,0-0.5,0.224-0.5,0.5v1c0,0.276,0.224,0.5,0.5,0.5H33	C33.552,19,34,18.552,34,18z M33,20c0,0.552,0.448,1,1,1h1.5c0.276,0,0.5-0.224,0.5-0.5v-1c0-0.276-0.224-0.5-0.5-0.5H34	C33.448,19,33,19.448,33,20z M33,24c0,0.552,0.448,1,1,1h1.5c0.276,0,0.5-0.224,0.5-0.5v-1c0-0.276-0.224-0.5-0.5-0.5H34	C33.448,23,33,23.448,33,24z M34,22c0-0.552-0.448-1-1-1h-1.5c-0.276,0-0.5,0.224-0.5,0.5v1c0,0.276,0.224,0.5,0.5,0.5H33	C33.552,23,34,22.552,34,22z"/><linearGradient id="bwc2gTApiQRdrgZvACv8Hc" x1="33.5" x2="33.5" y1="25.944" y2="37.581" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#4b4b4b"/><stop offset="1" stop-color="#3b3b3b"/></linearGradient><path fill="url(#bwc2gTApiQRdrgZvACv8Hc)" d="M36.128,26.848C36.055,26.358,35.635,26,35.139,26h-3.279c-0.495,0-0.915,0.358-0.988,0.848	C30.603,28.65,30,32.761,30,33.5c0,1.933,1.567,3.5,3.5,3.5s3.5-1.567,3.5-3.5C37,32.761,36.397,28.65,36.128,26.848z M33.5,35	c-0.828,0-1.5-0.672-1.5-1.5s0.672-1.5,1.5-1.5s1.5,0.672,1.5,1.5S34.328,35,33.5,35z"/></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-audio-file.svg b/datamodels/2.x/itop-attachments/icons/icons8-audio-file.svg
new file mode 100644
index 0000000000..98fec139fe
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-audio-file.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="500px" height="500px"><path fill="none" d="M204 0H252V48H204z"/><path fill="#90CAF9" d="M244 45L212 45 212 3 234 3 244 13z"/><path fill="#E1F5FE" d="M242.5 14L233 14 233 4.5z"/><path fill="#1976D2" d="M227 26A4 4 0 1 0 227 34A4 4 0 1 0 227 26Z"/><path fill="#1976D2" d="M234 21L229 19 229 30 231 30 231 22.9 234 24z"/><path fill="#90CAF9" d="M40 45L8 45 8 3 30 3 40 13z"/><path fill="#E1F5FE" d="M38.5 14L29 14 29 4.5z"/><g><path fill="#1976D2" d="M23 26A4 4 0 1 0 23 34A4 4 0 1 0 23 26Z"/><path fill="#1976D2" d="M30 21L25 19 25 30 27 30 27 22.9 30 24z"/></g></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-bandage.svg b/datamodels/2.x/itop-attachments/icons/icons8-bandage.svg
new file mode 100644
index 0000000000..36b163d706
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-bandage.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="480px" height="480px"><path fill="#FFCC80" d="M18.1,43.499c0,0-4.112,0.18-8.771-4.48c-4.66-4.659-4.481-8.772-4.481-8.772L30.592,4.501c0,0,4.111-0.181,8.771,4.48c4.66,4.66,4.481,8.772,4.481,8.772L18.1,43.499z"/><path fill="#FFA726" d="M25.193 31.949c-.763.76-1.997.76-2.758-.001l-5.727-5.728c-.762-.763-.762-1.996-.001-2.759l7.588-7.588c.761-.759 1.996-.76 2.757.003l5.688 5.688c.762.762.801 2.033.039 2.795L25.193 31.949zM13.4 27.929A1.5 1.5 0 1 0 13.4 30.929 1.5 1.5 0 1 0 13.4 27.929zM18.917 33.446A1.5 1.5 0 1 0 18.917 36.446 1.5 1.5 0 1 0 18.917 33.446zM14.46 36.007c-.585.586-1.538.587-2.12.001-.587-.586-.586-1.539 0-2.121.583-.586 1.535-.586 2.121 0C15.047 34.469 15.047 35.421 14.46 36.007zM35.468 16.895A1.5 1.5 0 1 0 35.468 19.895 1.5 1.5 0 1 0 35.468 16.895zM29.951 11.377A1.5 1.5 0 1 0 29.951 14.377 1.5 1.5 0 1 0 29.951 11.377zM35.469 11.377A1.5 1.5 0 1 0 35.469 14.377 1.5 1.5 0 1 0 35.469 11.377z"/></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-code-file.svg b/datamodels/2.x/itop-attachments/icons/icons8-code-file.svg
new file mode 100644
index 0000000000..5c437f12e9
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-code-file.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="500px" height="500px"><path fill="#50e6ff" d="M39,16v25c0,1.105-0.895,2-2,2H11c-1.105,0-2-0.895-2-2V7c0-1.105,0.895-2,2-2h17L39,16z"/><linearGradient id="_YTmg0F40MMcyQXhj11DSa" x1="28.529" x2="33.6" y1="15.472" y2="10.4" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#3079d6"/><stop offset="1" stop-color="#297cd2"/></linearGradient><path fill="url(#_YTmg0F40MMcyQXhj11DSa)" d="M28,5v9c0,1.105,0.895,2,2,2h9L28,5z"/><path fill="#0078d4" d="M14.121,29.292l3.962,3.962c0.161,0.161,0.423,0.161,0.584,0l0.837-0.837	c0.161-0.161,0.161-0.423,0-0.584l-3.962-3.962c-0.161-0.161-0.423-0.161-0.584,0l-0.837,0.837	C13.96,28.869,13.96,29.131,14.121,29.292z"/><path fill="#0078d4" d="M15.542,30.129l3.962-3.962c0.161-0.161,0.161-0.423,0-0.584l-0.837-0.837	c-0.161-0.161-0.423-0.161-0.584,0l-3.962,3.962c-0.161,0.161-0.161,0.423,0,0.584l0.837,0.837	C15.119,30.29,15.381,30.29,15.542,30.129z"/><path fill="#0078d4" d="M33.879,29.292l-3.962,3.962c-0.161,0.161-0.423,0.161-0.584,0l-0.837-0.837	c-0.161-0.161-0.161-0.423,0-0.584l3.962-3.962c0.161-0.161,0.423-0.161,0.584,0l0.837,0.837	C34.04,28.869,34.04,29.131,33.879,29.292z"/><path fill="#0078d4" d="M32.458,30.129l-3.962-3.962c-0.161-0.161-0.161-0.423,0-0.584l0.837-0.837	c0.161-0.161,0.423-0.161,0.584,0l3.962,3.962c0.161,0.161,0.161,0.423,0,0.584l-0.837,0.837	C32.881,30.29,32.619,30.29,32.458,30.129z"/><path fill="#0078d4" d="M26.604,20.042H25.1c-0.197,0-0.367,0.138-0.408,0.331L21.09,37.582	c-0.041,0.194,0.108,0.377,0.306,0.377H22.9c0.197,0,0.367-0.138,0.408-0.331l3.602-17.209	C26.951,20.224,26.802,20.042,26.604,20.042z"/></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-csv.svg b/datamodels/2.x/itop-attachments/icons/icons8-csv.svg
new file mode 100644
index 0000000000..64f1dc620d
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-csv.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="480px" height="480px"><path fill="#4DB6AC" d="M40 45L8 45 8 3 30 3 40 13z"/><path fill="#E0F2F1" d="M38.5 14L29 14 29 4.5z"/><path fill="#00695C" d="M20.045 29.685c-.05 1.135-.369 1.994-.957 2.577s-1.417.875-2.488.875c-1.125 0-1.988-.37-2.587-1.11-.599-.741-.899-1.797-.899-3.169v-1.675c0-1.367.31-2.421.93-3.162.62-.74 1.481-1.11 2.584-1.11 1.084 0 1.908.303 2.471.909s.883 1.477.96 2.611h-2.017c-.018-.702-.126-1.186-.325-1.453-.198-.266-.562-.399-1.09-.399-.538 0-.918.188-1.142.563-.223.377-.342.995-.355 1.856v1.88c0 .989.11 1.668.332 2.037s.601.554 1.138.554c.529 0 .893-.129 1.094-.386.201-.258.314-.724.342-1.398H20.045zM25.486 30.389c0-.405-.104-.712-.311-.919-.208-.208-.585-.423-1.132-.646-.998-.378-1.716-.821-2.153-1.33-.438-.508-.656-1.108-.656-1.801 0-.839.297-1.512.892-2.02.595-.509 1.35-.763 2.266-.763.611 0 1.155.129 1.634.386.479.258.847.621 1.104 1.091.257.47.386 1.003.386 1.6h-2.003c0-.465-.1-.819-.297-1.063-.199-.243-.485-.365-.858-.365-.351 0-.625.104-.82.311-.196.208-.294.487-.294.838 0 .273.109.521.328.742.219.221.606.449 1.162.687.971.351 1.676.781 2.115 1.292.44.511.66 1.16.66 1.948 0 .866-.275 1.543-.827 2.03s-1.302.731-2.249.731c-.643 0-1.228-.132-1.757-.396s-.942-.643-1.241-1.135-.448-1.073-.448-1.743h2.017c0 .574.112.991.335 1.251s.588.39 1.094.39C25.135 31.503 25.486 31.132 25.486 30.389zM32.083 30.266l1.675-7.219H36L33.129 33h-2.092l-2.851-9.953h2.229L32.083 30.266z"/></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-document.svg b/datamodels/2.x/itop-attachments/icons/icons8-document.svg
new file mode 100644
index 0000000000..414d3ed4f4
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-document.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="500px" height="500px"><path fill="#90CAF9" d="M40 45L8 45 8 3 30 3 40 13z"/><path fill="#E1F5FE" d="M38.5 14L29 14 29 4.5z"/><path fill="#1976D2" d="M16 21H33V23H16zM16 25H29V27H16zM16 29H33V31H16zM16 33H29V35H16z"/></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-event-log.svg b/datamodels/2.x/itop-attachments/icons/icons8-event-log.svg
new file mode 100644
index 0000000000..0c7196a481
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-event-log.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="500px" height="500px"><linearGradient id="SVGID_1_" x1="8.268" x2="38.902" y1="110.689" y2="78.192" gradientTransform="matrix(1 0 0 -1 0 118)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#7dd8f3"/><stop offset="1" stop-color="#45b0d0"/></linearGradient><path fill="url(#SVGID_1_)" d="M37,42H11c-1.1,0-2-1-2-2.3V8.3C9,7,9.9,6,11,6h26c1.1,0,2,1,2,2.3v31.4C39,41,38.1,42,37,42z"/><path fill="#057093" d="M34.5,23h-18c-0.3,0-0.5-0.2-0.5-0.5v-1c0-0.3,0.2-0.5,0.5-0.5h18c0.3,0,0.5,0.2,0.5,0.5v1 C35,22.8,34.8,23,34.5,23z"/><path fill="#057093" d="M34.5,28h-18c-0.3,0-0.5-0.2-0.5-0.5v-1c0-0.3,0.2-0.5,0.5-0.5h18c0.3,0,0.5,0.2,0.5,0.5v1 C35,27.8,34.8,28,34.5,28z"/><path fill="#057093" d="M34.5,13h-18c-0.3,0-0.5-0.2-0.5-0.5v-1c0-0.3,0.2-0.5,0.5-0.5h18c0.3,0,0.5,0.2,0.5,0.5v1 C35,12.8,34.8,13,34.5,13z"/><path fill="#057093" d="M34.5,18h-18c-0.3,0-0.5-0.2-0.5-0.5v-1c0-0.3,0.2-0.5,0.5-0.5h18c0.3,0,0.5,0.2,0.5,0.5v1 C35,17.8,34.8,18,34.5,18z"/><path fill="#057093" d="M34.5,33H16.5c-0.3,0-0.5-0.2-0.5-0.5v-1c0-0.3,0.2-0.5,0.5-0.5h18.1c0.3,0,0.5,0.2,0.5,0.5v1 C35,32.8,34.8,33,34.5,33z"/><path fill="#057093" d="M34.5,38H16.5c-0.3,0-0.5-0.2-0.5-0.5v-1c0-0.3,0.2-0.5,0.5-0.5h18.1c0.3,0,0.5,0.2,0.5,0.5v1 C35,37.8,34.8,38,34.5,38z"/><path fill="#057093" d="M12,13.5L12,13.5c0,0.8-0.7,1.5-1.5,1.5h-2C7.7,15,7,14.3,7,13.5l0,0C7,12.7,7.7,12,8.5,12h2 C11.3,12,12,12.7,12,13.5z"/><path fill="#057093" d="M12,20.5L12,20.5c0,0.8-0.7,1.5-1.5,1.5h-2C7.7,22,7,21.3,7,20.5l0,0C7,19.7,7.7,19,8.5,19h2 C11.3,19,12,19.7,12,20.5z"/><path fill="#057093" d="M12,27.5L12,27.5c0,0.8-0.7,1.5-1.5,1.5h-2C7.7,29,7,28.3,7,27.5l0,0C7,26.7,7.7,26,8.5,26h2 C11.3,26,12,26.7,12,27.5z"/><path fill="#057093" d="M12,34.5L12,34.5c0,0.8-0.7,1.5-1.5,1.5h-2C7.7,36,7,35.3,7,34.5l0,0C7,33.7,7.7,33,8.5,33h2 C11.3,33,12,33.7,12,34.5z"/><path d="M37,6h-5.5l-6.1,9.7c-0.1,0.1-0.4,0.6-0.4,1.2c0,1.1,0.9,2,2,2h12V8.3C39,7,38.1,6,37,6z" opacity=".05"/><path d="M37,6h-4.9l-6.3,10c0,0-0.3,0.4-0.3,0.9c0,0.9,0.7,1.5,1.5,1.5h12V8.3C39,7,38.1,6,37,6z" opacity=".07"/><linearGradient id="SVGID_2_" x1="-137.298" x2="43.76" y1="303.225" y2="95.565" gradientTransform="matrix(1 0 0 -1 0 118)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffda1c"/><stop offset="1" stop-color="#feb705"/></linearGradient><path fill="url(#SVGID_2_)" d="M47.8,16.3L37.9,0.5c0,0-0.3-0.5-0.9-0.5s-0.9,0.6-0.9,0.6l-9.9,15.7c0,0-0.2,0.3-0.2,0.6c0,0.6,0.5,1,1,1H47	c0.6,0,1-0.5,1-1C48,16.6,47.8,16.3,47.8,16.3z"/><radialGradient id="SVGID_3_" cx="33.956" cy="112.739" r="11.714" gradientTransform="matrix(1 0 0 -1 0 118)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#4b4b4b"/><stop offset=".531" stop-color="#393939"/><stop offset="1" stop-color="#252525"/></radialGradient><path fill="url(#SVGID_3_)" d="M37,15.9c-0.4,0-0.7-0.1-0.9-0.3s-0.4-0.5-0.4-0.8c0-0.3,0.1-0.6,0.4-0.8c0.3-0.2,0.6-0.3,0.9-0.3	c0.4,0,0.7,0.1,0.9,0.3c0.2,0.2,0.4,0.5,0.4,0.8c0,0.3-0.1,0.6-0.4,0.9C37.7,15.7,37.4,15.9,37,15.9z M38.2,5.8l-0.3,6.4	c0,0.2-0.2,0.3-0.4,0.3h-1.1c-0.2,0-0.4-0.2-0.4-0.3l-0.2-6.4c0-0.2,0.2-0.4,0.4-0.4h1.6C38,5.4,38.2,5.5,38.2,5.8z"/></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-file.svg b/datamodels/2.x/itop-attachments/icons/icons8-file.svg
new file mode 100644
index 0000000000..38f401dd84
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-file.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="500px" height="500px"><path fill="#50e6ff" d="M39,16v25c0,1.105-0.895,2-2,2H11c-1.105,0-2-0.895-2-2V7c0-1.105,0.895-2,2-2h17L39,16z"/><linearGradient id="nWVcHa0mbvW003e18hmLQa" x1="28.529" x2="33.6" y1="15.472" y2="10.4" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#3079d6"/><stop offset="1" stop-color="#297cd2"/></linearGradient><path fill="url(#nWVcHa0mbvW003e18hmLQa)" d="M28,5v9c0,1.105,0.895,2,2,2h9L28,5z"/></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-html-filetype.svg b/datamodels/2.x/itop-attachments/icons/icons8-html-filetype.svg
new file mode 100644
index 0000000000..e3785d0879
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-html-filetype.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="500px" height="500px"><path fill="#4DB6AC" d="M40 45L8 45 8 3 30 3 40 13z"/><path fill="#E0F2F1" d="M38.5 14L29 14 29 4.5z"/><path fill="#00695C" d="M15.999,33.953H14v-4.259h-3v4.259H9.02V24H11v4.026h3V24h1.999V33.953z M23,24h-6v1.675h2v8.278h2v-8.278h2V24z M24.036,24v9.953H26V31.26V27.11l1.85,6.843h1.367L31,27.11v4.149v2.693h2V24h-2.586l-1.873,7.198L26.66,24H24.036z M36,24h-2v9.953h5v-1.668h-3V24z"/></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-image-file.svg b/datamodels/2.x/itop-attachments/icons/icons8-image-file.svg
new file mode 100644
index 0000000000..b762119fa0
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-image-file.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="480px" height="480px"><path fill="#90CAF9" d="M40 45L8 45 8 3 30 3 40 13z"/><path fill="#E1F5FE" d="M38.5 14L29 14 29 4.5z"/><path fill="#1565C0" d="M21 23L14 33 28 33z"/><path fill="#1976D2" d="M28 26.4L23 33 33 33zM31.5 23A1.5 1.5 0 1 0 31.5 26 1.5 1.5 0 1 0 31.5 23z"/></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-libre-office-base.svg b/datamodels/2.x/itop-attachments/icons/icons8-libre-office-base.svg
new file mode 100644
index 0000000000..3fe5fc649e
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-libre-office-base.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="500px" height="500px"><linearGradient id="FhRUKypBhew0ZXZ9GCZiDa" x1="24" x2="24" y1="44.333" y2="27.939" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#912fbd"/><stop offset="1" stop-color="#9332bf"/></linearGradient><path fill="url(#FhRUKypBhew0ZXZ9GCZiDa)" d="M39,44H9c-1.105,0-2-0.895-2-2V6c0-1.105,0.895-2,2-2h30c1.105,0,2,0.895,2,2v36	C41,43.105,40.105,44,39,44z"/><path d="M29.172,6c0.53,0,1.039,0.211,1.414,0.586l7.828,7.828C38.789,14.789,39,15.298,39,15.828V41c0,0.552-0.448,1-1,1H10 c-0.552,0-1-0.448-1-1V7c0-0.552,0.448-1,1-1H29.172 M29.172,5H10C8.897,5,8,5.897,8,7v34c0,1.103,0.897,2,2,2h28 c1.103,0,2-0.897,2-2V15.828c0-0.801-0.312-1.555-0.879-2.121l-7.828-7.828C30.726,5.312,29.973,5,29.172,5L29.172,5z" opacity=".05"/><path d="M29.172,6c0.53,0,1.039,0.211,1.414,0.586l7.828,7.828C38.789,14.789,39,15.298,39,15.828V41c0,0.552-0.448,1-1,1H10 c-0.552,0-1-0.448-1-1V7c0-0.552,0.448-1,1-1H29.172 M29.172,5.5H10C9.173,5.5,8.5,6.173,8.5,7v34c0,0.827,0.673,1.5,1.5,1.5h28 c0.827,0,1.5-0.673,1.5-1.5V15.828c0-0.668-0.26-1.296-0.732-1.768l-7.828-7.828C30.467,5.76,29.839,5.5,29.172,5.5L29.172,5.5z" opacity=".07"/><linearGradient id="FhRUKypBhew0ZXZ9GCZiDb" x1="24" x2="24" y1="18.333" y2="61.003" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f9f9f9"/><stop offset=".26" stop-color="#f0f1f2"/><stop offset=".678" stop-color="#d9dcdf"/><stop offset="1" stop-color="#c2c8cc"/></linearGradient><path fill="url(#FhRUKypBhew0ZXZ9GCZiDb)" d="M10,6C9.448,6,9,6.448,9,7v34c0,0.552,0.448,1,1,1h28c0.552,0,1-0.448,1-1V15.828 c0-0.53-0.211-1.039-0.586-1.414l-7.828-7.828C30.211,6.211,29.702,6,29.172,6H10z"/><path fill="#e8c4f5" d="M15.5,39h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C16,38.776,15.776,39,15.5,39z"/><path fill="#e8c4f5" d="M22.5,39h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C23,38.776,22.776,39,22.5,39z"/><path fill="#e8c4f5" d="M29.5,39h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C30,38.776,29.776,39,29.5,39z"/><path fill="#e8c4f5" d="M36.5,39h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C37,38.776,36.776,39,36.5,39z"/><path fill="#e8c4f5" d="M15.5,36h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C16,35.776,15.776,36,15.5,36z"/><path fill="#e8c4f5" d="M22.5,36h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C23,35.776,22.776,36,22.5,36z"/><path fill="#e8c4f5" d="M29.5,36h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C30,35.776,29.776,36,29.5,36z"/><path fill="#e8c4f5" d="M36.5,36h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C37,35.776,36.776,36,36.5,36z"/><path fill="#e8c4f5" d="M15.5,33h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C16,32.776,15.776,33,15.5,33z"/><path fill="#e8c4f5" d="M22.5,33h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C23,32.776,22.776,33,22.5,33z"/><path fill="#e8c4f5" d="M29.5,33h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C30,32.776,29.776,33,29.5,33z"/><path fill="#e8c4f5" d="M36.5,33h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C37,32.776,36.776,33,36.5,33z"/><path fill="#e8c4f5" d="M15.5,30h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C16,29.776,15.776,30,15.5,30z"/><path fill="#e8c4f5" d="M22.5,30h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C23,29.776,22.776,30,22.5,30z"/><path fill="#e8c4f5" d="M29.5,30h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C30,29.776,29.776,30,29.5,30z"/><path fill="#e8c4f5" d="M36.5,30h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C37,29.776,36.776,30,36.5,30z"/><g><path fill="#e8c4f5" d="M15.5,27h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C16,26.776,15.776,27,15.5,27z"/><path fill="#e8c4f5" d="M22.5,27h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C23,26.776,22.776,27,22.5,27z"/><path fill="#e8c4f5" d="M29.5,27h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C30,26.776,29.776,27,29.5,27z"/><path fill="#e8c4f5" d="M36.5,27h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C37,26.776,36.776,27,36.5,27z"/></g><g><path fill="#e8c4f5" d="M15.5,24h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C16,23.776,15.776,24,15.5,24z"/><path fill="#e8c4f5" d="M22.5,24h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C23,23.776,22.776,24,22.5,24z"/><path fill="#e8c4f5" d="M29.5,24h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C30,23.776,29.776,24,29.5,24z"/><path fill="#e8c4f5" d="M36.5,24h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C37,23.776,36.776,24,36.5,24z"/></g><g><path fill="#e8c4f5" d="M15.5,21h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C16,20.776,15.776,21,15.5,21z"/><path fill="#e8c4f5" d="M22.5,21h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C23,20.776,22.776,21,22.5,21z"/><path fill="#e8c4f5" d="M29.5,21h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C30,20.776,29.776,21,29.5,21z"/><path fill="#e8c4f5" d="M36.5,21h-4c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h4c0.276,0,0.5,0.224,0.5,0.5 v1C37,20.776,36.776,21,36.5,21z"/></g><g><linearGradient id="FhRUKypBhew0ZXZ9GCZiDc" x1="17" x2="31" y1="537.355" y2="537.355" gradientTransform="matrix(1 0 0 -1 0 572)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#7819a2"/><stop offset="1" stop-color="#771aa9"/></linearGradient><path fill="url(#FhRUKypBhew0ZXZ9GCZiDc)" d="M31,31.289H17c0,0,0,4.595,0,4.921C17,37.199,20.134,38,24,38s7-0.801,7-1.789 C31,35.884,31,31.289,31,31.289z"/><linearGradient id="FhRUKypBhew0ZXZ9GCZiDd" x1="17" x2="31" y1="542.355" y2="542.355" gradientTransform="matrix(1 0 0 -1 0 572)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#912fbd"/><stop offset="1" stop-color="#9332bf"/></linearGradient><path fill="url(#FhRUKypBhew0ZXZ9GCZiDd)" d="M31,26.289H17c0,0,0,4.595,0,4.921C17,32.199,20.134,33,24,33s7-0.801,7-1.789 C31,30.884,31,26.289,31,26.289z"/><linearGradient id="FhRUKypBhew0ZXZ9GCZiDe" x1="17" x2="31" y1="547" y2="547" gradientTransform="matrix(1 0 0 -1 0 572)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ae4cd5"/><stop offset="1" stop-color="#ac4ad5"/></linearGradient><path fill="url(#FhRUKypBhew0ZXZ9GCZiDe)" d="M31,22H17c0,0,0,3.982,0,4.336C17,27.255,20.134,28,24,28s7-0.745,7-1.664 C31,25.982,31,22,31,22z"/><linearGradient id="FhRUKypBhew0ZXZ9GCZiDf" x1="17" x2="31" y1="550" y2="550" gradientTransform="matrix(1 0 0 -1 0 572)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c965eb"/><stop offset="1" stop-color="#c767e5"/></linearGradient><ellipse cx="24" cy="22" fill="url(#FhRUKypBhew0ZXZ9GCZiDf)" rx="7" ry="2"/></g></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-libre-office-calc.svg b/datamodels/2.x/itop-attachments/icons/icons8-libre-office-calc.svg
new file mode 100644
index 0000000000..d4792eca41
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-libre-office-calc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="500px" height="500px"><linearGradient id="J~FgtzGqlt98Fc0Riuxq9a" x1="24" x2="24" y1="6" y2="45.172" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#4caf50"/><stop offset=".489" stop-color="#4aaf50"/><stop offset=".665" stop-color="#43ad50"/><stop offset=".79" stop-color="#38aa50"/><stop offset=".892" stop-color="#27a550"/><stop offset=".978" stop-color="#11a050"/><stop offset="1" stop-color="#0a9e50"/></linearGradient><path fill="url(#J~FgtzGqlt98Fc0Riuxq9a)" d="M39,44H9c-1.105,0-2-0.895-2-2V6c0-1.105,0.895-2,2-2h30c1.105,0,2,0.895,2,2v36	C41,43.105,40.105,44,39,44z"/><path d="M29.172,6c0.53,0,1.039,0.211,1.414,0.586l7.828,7.828C38.789,14.789,39,15.298,39,15.828V41c0,0.552-0.448,1-1,1H10 c-0.552,0-1-0.448-1-1V7c0-0.552,0.448-1,1-1H29.172 M29.172,5H10C8.897,5,8,5.897,8,7v34c0,1.103,0.897,2,2,2h28 c1.103,0,2-0.897,2-2V15.828c0-0.801-0.312-1.555-0.879-2.121l-7.828-7.828C30.726,5.312,29.973,5,29.172,5L29.172,5z" opacity=".05"/><path d="M29.172,6c0.53,0,1.039,0.211,1.414,0.586l7.828,7.828C38.789,14.789,39,15.298,39,15.828V41c0,0.552-0.448,1-1,1H10 c-0.552,0-1-0.448-1-1V7c0-0.552,0.448-1,1-1H29.172 M29.172,5.5H10C9.173,5.5,8.5,6.173,8.5,7v34c0,0.827,0.673,1.5,1.5,1.5h28 c0.827,0,1.5-0.673,1.5-1.5V15.828c0-0.668-0.26-1.296-0.732-1.768l-7.828-7.828C30.467,5.76,29.839,5.5,29.172,5.5L29.172,5.5z" opacity=".07"/><linearGradient id="J~FgtzGqlt98Fc0Riuxq9b" x1="24" x2="24" y1="18.333" y2="61.003" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f9f9f9"/><stop offset=".26" stop-color="#f0f1f2"/><stop offset=".678" stop-color="#d9dcdf"/><stop offset="1" stop-color="#c2c8cc"/></linearGradient><path fill="url(#J~FgtzGqlt98Fc0Riuxq9b)" d="M10,6C9.448,6,9,6.448,9,7v34c0,0.552,0.448,1,1,1h28c0.552,0,1-0.448,1-1V15.828 c0-0.53-0.211-1.039-0.586-1.414l-7.828-7.828C30.211,6.211,29.702,6,29.172,6H10z"/><path fill="#c0edc0" d="M17.5,34h-5c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h5c0.276,0,0.5,0.224,0.5,0.5 v1C18,33.776,17.776,34,17.5,34z"/><path fill="#c0edc0" d="M25.5,34h-5c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h5c0.276,0,0.5,0.224,0.5,0.5 v1C26,33.776,25.776,34,25.5,34z"/><path fill="#c0edc0" d="M33.5,34h-5c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h5c0.276,0,0.5,0.224,0.5,0.5 v1C34,33.776,33.776,34,33.5,34z"/><path fill="#c0edc0" d="M17.5,31h-5c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h5c0.276,0,0.5,0.224,0.5,0.5 v1C18,30.776,17.776,31,17.5,31z"/><path fill="#c0edc0" d="M25.5,31h-5c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h5c0.276,0,0.5,0.224,0.5,0.5 v1C26,30.776,25.776,31,25.5,31z"/><path fill="#c0edc0" d="M33.5,31h-5c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h5c0.276,0,0.5,0.224,0.5,0.5 v1C34,30.776,33.776,31,33.5,31z"/><path fill="#c0edc0" d="M17.5,28h-5c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h5c0.276,0,0.5,0.224,0.5,0.5 v1C18,27.776,17.776,28,17.5,28z"/><path fill="#c0edc0" d="M25.5,28h-5c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h5c0.276,0,0.5,0.224,0.5,0.5 v1C26,27.776,25.776,28,25.5,28z"/><path fill="#c0edc0" d="M33.5,28h-5c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h5c0.276,0,0.5,0.224,0.5,0.5 v1C34,27.776,33.776,28,33.5,28z"/><path fill="#9fdd9f" d="M17.5,25h-5c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h5c0.276,0,0.5,0.224,0.5,0.5 v1C18,24.776,17.776,25,17.5,25z"/><path fill="#9fdd9f" d="M25.5,25h-5c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h5c0.276,0,0.5,0.224,0.5,0.5 v1C26,24.776,25.776,25,25.5,25z"/><path fill="#9fdd9f" d="M33.5,25h-5c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h5c0.276,0,0.5,0.224,0.5,0.5 v1C34,24.776,33.776,25,33.5,25z"/><path fill="#c0edc0" d="M17.5,37h-5c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h5c0.276,0,0.5,0.224,0.5,0.5 v1C18,36.776,17.776,37,17.5,37z"/><path fill="#c0edc0" d="M25.5,37h-5c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h5c0.276,0,0.5,0.224,0.5,0.5 v1C26,36.776,25.776,37,25.5,37z"/><path fill="#c0edc0" d="M33.5,37h-5c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h5c0.276,0,0.5,0.224,0.5,0.5 v1C34,36.776,33.776,37,33.5,37z"/><g><linearGradient id="J~FgtzGqlt98Fc0Riuxq9c" x1="25.5" x2="25.5" y1="31.963" y2="40.207" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#2aa4f4"/><stop offset="1" stop-color="#007ad9"/></linearGradient><path fill="url(#J~FgtzGqlt98Fc0Riuxq9c)" d="M27,39h-3v-6.563C24,32.196,24.224,32,24.5,32h2c0.276,0,0.5,0.196,0.5,0.438V39z"/><linearGradient id="J~FgtzGqlt98Fc0Riuxq9d" x1="28.5" x2="28.5" y1="30.958" y2="40.38" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d43a02"/><stop offset="1" stop-color="#b9360c"/></linearGradient><path fill="url(#J~FgtzGqlt98Fc0Riuxq9d)" d="M29.979,39h-2.958C27.009,39,27,38.991,27,38.979V30.5c0-0.276,0.224-0.5,0.5-0.5h2 c0.276,0,0.5,0.224,0.5,0.5v8.479C30,38.991,29.991,39,29.979,39z"/><linearGradient id="J~FgtzGqlt98Fc0Riuxq9e" x1="31.5" x2="31.5" y1="32.567" y2="40.104" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffd747"/><stop offset=".21" stop-color="#ffd645"/><stop offset=".44" stop-color="#fed43e"/><stop offset=".651" stop-color="#fccf33"/><stop offset=".766" stop-color="#fac922"/><stop offset=".897" stop-color="#f7c10c"/><stop offset="1" stop-color="#f5bc00"/></linearGradient><path fill="url(#J~FgtzGqlt98Fc0Riuxq9e)" d="M33,39h-3v-3.6c0-0.221,0.224-0.4,0.5-0.4h2c0.276,0,0.5,0.179,0.5,0.4V39z"/><linearGradient id="J~FgtzGqlt98Fc0Riuxq9f" x1="34.5" x2="34.5" y1="30.958" y2="40.38" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#4caf50"/><stop offset=".489" stop-color="#4aaf50"/><stop offset=".665" stop-color="#43ad50"/><stop offset=".79" stop-color="#38aa50"/><stop offset=".892" stop-color="#27a550"/><stop offset=".978" stop-color="#11a050"/><stop offset="1" stop-color="#0a9e50"/></linearGradient><path fill="url(#J~FgtzGqlt98Fc0Riuxq9f)" d="M36,39h-3v-5.5c0-0.276,0.224-0.5,0.5-0.5h2c0.276,0,0.5,0.224,0.5,0.5V39z"/></g></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-libre-office-draw.svg b/datamodels/2.x/itop-attachments/icons/icons8-libre-office-draw.svg
new file mode 100644
index 0000000000..a1101e9e50
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-libre-office-draw.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="500px" height="500px"><linearGradient id="8gMxoOp28nkY4FOVZcQ8Fa" x1="24" x2="24" y1="4.938" y2="34.519" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffd747"/><stop offset=".21" stop-color="#ffd645"/><stop offset=".44" stop-color="#fed43e"/><stop offset=".651" stop-color="#fccf33"/><stop offset=".766" stop-color="#fac922"/><stop offset=".897" stop-color="#f7c10c"/><stop offset="1" stop-color="#f5bc00"/></linearGradient><path fill="url(#8gMxoOp28nkY4FOVZcQ8Fa)" d="M39,44H9c-1.105,0-2-0.895-2-2V6c0-1.105,0.895-2,2-2h30c1.105,0,2,0.895,2,2v36	C41,43.105,40.105,44,39,44z"/><path d="M29.172,6c0.53,0,1.039,0.211,1.414,0.586l7.828,7.828C38.789,14.789,39,15.298,39,15.828V41c0,0.552-0.448,1-1,1H10 c-0.552,0-1-0.448-1-1V7c0-0.552,0.448-1,1-1H29.172 M29.172,5H10C8.897,5,8,5.897,8,7v34c0,1.103,0.897,2,2,2h28 c1.103,0,2-0.897,2-2V15.828c0-0.801-0.312-1.555-0.879-2.121l-7.828-7.828C30.726,5.312,29.973,5,29.172,5L29.172,5z" opacity=".05"/><path d="M29.172,6c0.53,0,1.039,0.211,1.414,0.586l7.828,7.828C38.789,14.789,39,15.298,39,15.828V41c0,0.552-0.448,1-1,1H10 c-0.552,0-1-0.448-1-1V7c0-0.552,0.448-1,1-1H29.172 M29.172,5.5H10C9.173,5.5,8.5,6.173,8.5,7v34c0,0.827,0.673,1.5,1.5,1.5h28 c0.827,0,1.5-0.673,1.5-1.5V15.828c0-0.668-0.26-1.296-0.732-1.768l-7.828-7.828C30.467,5.76,29.839,5.5,29.172,5.5L29.172,5.5z" opacity=".07"/><linearGradient id="8gMxoOp28nkY4FOVZcQ8Fb" x1="24" x2="24" y1="18.333" y2="61.003" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f9f9f9"/><stop offset=".26" stop-color="#f0f1f2"/><stop offset=".678" stop-color="#d9dcdf"/><stop offset="1" stop-color="#c2c8cc"/></linearGradient><path fill="url(#8gMxoOp28nkY4FOVZcQ8Fb)" d="M10,6C9.448,6,9,6.448,9,7v34c0,0.552,0.448,1,1,1h28c0.552,0,1-0.448,1-1V15.828 c0-0.53-0.211-1.039-0.586-1.414l-7.828-7.828C30.211,6.211,29.702,6,29.172,6H10z"/><linearGradient id="8gMxoOp28nkY4FOVZcQ8Fc" x1="15.854" x2="22.091" y1="22.854" y2="29.091" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d43a02"/><stop offset=".815" stop-color="#b9360c"/><stop offset=".992" stop-color="#a33611"/></linearGradient><circle cx="19.5" cy="26.5" r="6.5" fill="url(#8gMxoOp28nkY4FOVZcQ8Fc)"/><linearGradient id="8gMxoOp28nkY4FOVZcQ8Fd" x1="32.113" x2="24.988" y1="27.666" y2="32.666" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#2aa4f4"/><stop offset=".887" stop-color="#007ad9"/><stop offset=".992" stop-color="#0067d7"/></linearGradient><path fill="url(#8gMxoOp28nkY4FOVZcQ8Fd)" d="M34.5,35h-10c-0.276,0-0.5-0.224-0.5-0.5v-10c0-0.276,0.224-0.5,0.5-0.5h10	c0.276,0,0.5,0.224,0.5,0.5v10C35,34.776,34.776,35,34.5,35z"/><linearGradient id="8gMxoOp28nkY4FOVZcQ8Fe" x1="22.5" x2="22.5" y1="27.375" y2="37.373" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffd747"/><stop offset=".21" stop-color="#ffd645"/><stop offset=".44" stop-color="#fed43e"/><stop offset=".651" stop-color="#fccf33"/><stop offset=".766" stop-color="#fac922"/><stop offset=".897" stop-color="#f7c10c"/><stop offset="1" stop-color="#f5bc00"/></linearGradient><polygon fill="url(#8gMxoOp28nkY4FOVZcQ8Fe)" points="16,38 22,27 29,38"/><path fill="#4caf50" d="M22.5,28h-1c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h1c0.276,0,0.5,0.224,0.5,0.5 v1C23,27.776,22.776,28,22.5,28z"/><path fill="#4caf50" d="M16.5,39h-1c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h1c0.276,0,0.5,0.224,0.5,0.5 v1C17,38.776,16.776,39,16.5,39z"/><path fill="#4caf50" d="M29.5,39h-1c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h1c0.276,0,0.5,0.224,0.5,0.5 v1C30,38.776,29.776,39,29.5,39z"/></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-libre-office-impress.svg b/datamodels/2.x/itop-attachments/icons/icons8-libre-office-impress.svg
new file mode 100644
index 0000000000..7774063aac
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-libre-office-impress.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="500px" height="500px"><linearGradient id="5uCc7CDJjXLLl4tLpDE_La" x1="24" x2="24" y1="10.167" y2="41.667" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d43a02"/><stop offset="1" stop-color="#b9360c"/></linearGradient><path fill="url(#5uCc7CDJjXLLl4tLpDE_La)" d="M39,44H9c-1.105,0-2-0.895-2-2V6c0-1.105,0.895-2,2-2h30c1.105,0,2,0.895,2,2v36	C41,43.105,40.105,44,39,44z"/><path d="M29.172,6c0.53,0,1.039,0.211,1.414,0.586l7.828,7.828C38.789,14.789,39,15.298,39,15.828V41c0,0.552-0.448,1-1,1H10 c-0.552,0-1-0.448-1-1V7c0-0.552,0.448-1,1-1H29.172 M29.172,5H10C8.897,5,8,5.897,8,7v34c0,1.103,0.897,2,2,2h28 c1.103,0,2-0.897,2-2V15.828c0-0.801-0.312-1.555-0.879-2.121l-7.828-7.828C30.726,5.312,29.973,5,29.172,5L29.172,5z" opacity=".05"/><path d="M29.172,6c0.53,0,1.039,0.211,1.414,0.586l7.828,7.828C38.789,14.789,39,15.298,39,15.828V41c0,0.552-0.448,1-1,1H10 c-0.552,0-1-0.448-1-1V7c0-0.552,0.448-1,1-1H29.172 M29.172,5.5H10C9.173,5.5,8.5,6.173,8.5,7v34c0,0.827,0.673,1.5,1.5,1.5h28 c0.827,0,1.5-0.673,1.5-1.5V15.828c0-0.668-0.26-1.296-0.732-1.768l-7.828-7.828C30.467,5.76,29.839,5.5,29.172,5.5L29.172,5.5z" opacity=".07"/><linearGradient id="5uCc7CDJjXLLl4tLpDE_Lb" x1="24" x2="24" y1="18.333" y2="61.003" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f9f9f9"/><stop offset=".26" stop-color="#f0f1f2"/><stop offset=".678" stop-color="#d9dcdf"/><stop offset="1" stop-color="#c2c8cc"/></linearGradient><path fill="url(#5uCc7CDJjXLLl4tLpDE_Lb)" d="M10,6C9.448,6,9,6.448,9,7v34c0,0.552,0.448,1,1,1h28c0.552,0,1-0.448,1-1V15.828 c0-0.53-0.211-1.039-0.586-1.414l-7.828-7.828C30.211,6.211,29.702,6,29.172,6H10z"/><path fill="#18518a" d="M20,39.25c-0.103,0-0.206-0.021-0.305-0.064c-0.379-0.168-0.549-0.612-0.381-0.99l2-4.5 c0.168-0.379,0.616-0.547,0.99-0.381c0.379,0.168,0.549,0.612,0.381,0.99l-2,4.5C20.562,39.084,20.287,39.25,20,39.25z"/><path fill="#18518a" d="M28,39.25c-0.287,0-0.562-0.166-0.686-0.445l-2-4.5c-0.168-0.378,0.002-0.822,0.381-0.99 c0.374-0.167,0.822,0.002,0.99,0.381l2,4.5c0.168,0.378-0.002,0.822-0.381,0.99C28.206,39.229,28.103,39.25,28,39.25z"/><path fill="#18518a" d="M24,20.5c-0.276,0-0.5-0.224-0.5-0.5v-1.5c0-0.276,0.224-0.5,0.5-0.5s0.5,0.224,0.5,0.5V20 C24.5,20.276,24.276,20.5,24,20.5z"/><radialGradient id="5uCc7CDJjXLLl4tLpDE_Lc" cx="29.5" cy="30.125" r="15.052" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d43a02"/><stop offset="1" stop-color="#b9360c"/></radialGradient><path fill="url(#5uCc7CDJjXLLl4tLpDE_Lc)" d="M34,35H14c-0.552,0-1-0.448-1-1V20c0-0.552,0.448-1,1-1h20c0.552,0,1,0.448,1,1v14	C35,34.552,34.552,35,34,35z"/><path fill="#fff" d="M32.5,23h-17c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h17 c0.276,0,0.5,0.224,0.5,0.5v1C33,22.776,32.776,23,32.5,23z"/><path fill="#fff" d="M22.5,28h-3c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h3c0.276,0,0.5,0.224,0.5,0.5 v1C23,27.776,22.776,28,22.5,28z"/><path fill="#fff" d="M16.5,28h-1c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h1c0.276,0,0.5,0.224,0.5,0.5 v1C17,27.776,16.776,28,16.5,28z"/><path fill="#fff" d="M16.5,32h-1c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h1c0.276,0,0.5,0.224,0.5,0.5 v1C17,31.776,16.776,32,16.5,32z"/><path fill="#fff" d="M22.5,32h-3c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h3c0.276,0,0.5,0.224,0.5,0.5 v1C23,31.776,22.776,32,22.5,32z"/><path fill="#fff" d="M25.999,33c-0.15,0-0.303-0.034-0.446-0.105c-0.494-0.247-0.694-0.848-0.447-1.342l2-4	c0.144-0.288,0.417-0.488,0.734-0.54c0.321-0.05,0.641,0.054,0.867,0.28l1.019,1.019l1.38-2.759	c0.248-0.494,0.849-0.694,1.342-0.447c0.494,0.247,0.694,0.848,0.447,1.342l-2,4c-0.144,0.288-0.417,0.488-0.734,0.54	c-0.319,0.05-0.641-0.053-0.867-0.28l-1.019-1.019l-1.38,2.759C26.719,32.798,26.366,33,25.999,33z"/></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-libre-office-writer.svg b/datamodels/2.x/itop-attachments/icons/icons8-libre-office-writer.svg
new file mode 100644
index 0000000000..df15cb64fc
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-libre-office-writer.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="500px" height="500px"><linearGradient id="0MtJvRt2D3AKqsnCo1poSa" x1="24" x2="24" y1="5.417" y2="45.921" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#2aa4f4"/><stop offset="1" stop-color="#007ad9"/></linearGradient><path fill="url(#0MtJvRt2D3AKqsnCo1poSa)" d="M39,44H9c-1.105,0-2-0.895-2-2V6c0-1.105,0.895-2,2-2h30c1.105,0,2,0.895,2,2v36	C41,43.105,40.105,44,39,44z"/><path d="M29.172,6c0.53,0,1.039,0.211,1.414,0.586l7.828,7.828C38.789,14.789,39,15.298,39,15.828V41c0,0.552-0.448,1-1,1H10 c-0.552,0-1-0.448-1-1V7c0-0.552,0.448-1,1-1H29.172 M29.172,5H10C8.897,5,8,5.897,8,7v34c0,1.103,0.897,2,2,2h28 c1.103,0,2-0.897,2-2V15.828c0-0.801-0.312-1.555-0.879-2.121l-7.828-7.828C30.726,5.312,29.973,5,29.172,5L29.172,5z" opacity=".05"/><path d="M29.172,6c0.53,0,1.039,0.211,1.414,0.586l7.828,7.828C38.789,14.789,39,15.298,39,15.828V41c0,0.552-0.448,1-1,1H10 c-0.552,0-1-0.448-1-1V7c0-0.552,0.448-1,1-1H29.172 M29.172,5.5H10C9.173,5.5,8.5,6.173,8.5,7v34c0,0.827,0.673,1.5,1.5,1.5h28 c0.827,0,1.5-0.673,1.5-1.5V15.828c0-0.668-0.26-1.296-0.732-1.768l-7.828-7.828C30.467,5.76,29.839,5.5,29.172,5.5L29.172,5.5z" opacity=".07"/><linearGradient id="0MtJvRt2D3AKqsnCo1poSb" x1="24" x2="24" y1="18.333" y2="61.003" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f9f9f9"/><stop offset=".26" stop-color="#f0f1f2"/><stop offset=".678" stop-color="#d9dcdf"/><stop offset="1" stop-color="#c2c8cc"/></linearGradient><path fill="url(#0MtJvRt2D3AKqsnCo1poSb)" d="M10,6C9.448,6,9,6.448,9,7v34c0,0.552,0.448,1,1,1h28c0.552,0,1-0.448,1-1V15.828 c0-0.53-0.211-1.039-0.586-1.414l-7.828-7.828C30.211,6.211,29.702,6,29.172,6H10z"/><radialGradient id="0MtJvRt2D3AKqsnCo1poSc" cx="38.149" cy="542.534" r="7.481" gradientTransform="matrix(1.0111 0 0 -1 -.233 572)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#bd8af5"/><stop offset=".137" stop-color="#b88bf5"/><stop offset=".309" stop-color="#a88ff3"/><stop offset=".499" stop-color="#8f96f2"/><stop offset=".702" stop-color="#6b9eef"/><stop offset=".913" stop-color="#3eaaec"/><stop offset="1" stop-color="#29afea"/></radialGradient><path fill="url(#0MtJvRt2D3AKqsnCo1poSc)" d="M34.556,21H24.444C23.646,21,23,21.639,23,22.429v6.429C23,30.041,23.97,31,25.167,31h9.062 C35.207,31,36,30.216,36,29.249v-6.82C36,21.639,35.354,21,34.556,21z"/><path fill="#436dcd" d="M36,29.206l-3.733-3.89c-0.417-0.413-1.091-0.421-1.52-0.02l-3.414,3.102V31h7.222 C35.354,31,36,30.361,36,29.571V29.206z"/><linearGradient id="0MtJvRt2D3AKqsnCo1poSd" x1="28.778" x2="28.778" y1="548.016" y2="540.878" gradientTransform="matrix(1 0 0 -1 0 572)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#124787"/><stop offset=".923" stop-color="#173b75"/><stop offset="1" stop-color="#173a73"/></linearGradient><path fill="url(#0MtJvRt2D3AKqsnCo1poSd)" d="M34.556,31l-6.632-6.615c-0.509-0.504-1.331-0.514-1.854-0.025L23,27.159v2.413 C23,30.361,23.646,31,24.444,31H34.556z"/><ellipse cx="33" cy="22.989" fill="#fff" rx="1" ry=".989"/><path fill="#29afea" d="M20.5,23h-8c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h8c0.276,0,0.5,0.224,0.5,0.5v1	C21,22.776,20.776,23,20.5,23z"/><path fill="#29afea" d="M20.5,27h-8c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h8c0.276,0,0.5,0.224,0.5,0.5v1	C21,26.776,20.776,27,20.5,27z"/><path fill="#29afea" d="M20.5,31h-8c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h8c0.276,0,0.5,0.224,0.5,0.5v1	C21,30.776,20.776,31,20.5,31z"/><path fill="#29afea" d="M35.5,35h-23c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h23c0.276,0,0.5,0.224,0.5,0.5	v1C36,34.776,35.776,35,35.5,35z"/><path fill="#29afea" d="M35.5,39h-23c-0.276,0-0.5-0.224-0.5-0.5v-1c0-0.276,0.224-0.5,0.5-0.5h23c0.276,0,0.5,0.224,0.5,0.5	v1C36,38.776,35.776,39,35.5,39z"/></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-mail.svg b/datamodels/2.x/itop-attachments/icons/icons8-mail.svg
new file mode 100644
index 0000000000..4284bef81c
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-mail.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="500px" height="500px"><linearGradient id="HRVHurZmxZb2bftTgcc55a" x1="18.921" x2="25.143" y1="5.715" y2="26.715" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#0078d3"/><stop offset="1" stop-color="#0858a1"/></linearGradient><path fill="url(#HRVHurZmxZb2bftTgcc55a)" d="M43,29.452H5V16.554c0-0.686,0.352-1.325,0.932-1.691l16.466-10.4	c0.979-0.618,2.225-0.618,3.204,0l16.466,10.4C42.648,15.23,43,15.868,43,16.554V29.452z"/><linearGradient id="HRVHurZmxZb2bftTgcc55b" x1="24" x2="24" y1="15.394" y2="28.484" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset=".24" stop-color="#f8f8f7"/><stop offset="1" stop-color="#e3e3e1"/></linearGradient><path fill="url(#HRVHurZmxZb2bftTgcc55b)" d="M39,33H9V16c0-0.552,0.448-1,1-1h28c0.552,0,1,0.448,1,1V33z"/><linearGradient id="HRVHurZmxZb2bftTgcc55c" x1="25.886" x2="37.997" y1="27.936" y2="45.269" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#3ccbf4"/><stop offset="1" stop-color="#1fa0e5"/></linearGradient><path fill="url(#HRVHurZmxZb2bftTgcc55c)" d="M43,17v21.256C43,39.219,42.206,40,41.226,40H9.56l4.803-6.327L43,17z"/><linearGradient id="HRVHurZmxZb2bftTgcc55d" x1="3.074" x2="39.962" y1="27.236" y2="45.125" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#28afea"/><stop offset="1" stop-color="#0b88da"/></linearGradient><path fill="url(#HRVHurZmxZb2bftTgcc55d)" d="M5,17v21.256C5,39.219,5.794,40,6.774,40h34.453c0.56,0,1.053-0.26,1.378-0.658L5,17z"/></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-pdf.svg b/datamodels/2.x/itop-attachments/icons/icons8-pdf.svg
new file mode 100644
index 0000000000..912ef17da6
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-pdf.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="500px" height="500px"><path fill="#ffadc8" d="M39,16v25c0,1.105-0.895,2-2,2H11c-1.105,0-2-0.895-2-2V7c0-1.105,0.895-2,2-2h17L39,16z"/><path fill="#e72636" d="M28,5v9c0,1.105,0.895,2,2,2h9L28,5z"/><path fill="#e72636" d="M16.738,26.99v2.531h-1.655v-7.348h2.592c1.852,0,2.777,0.781,2.777,2.342 c0,0.738-0.265,1.335-0.797,1.791c-0.531,0.456-1.241,0.684-2.129,0.684H16.738z M16.738,23.445v2.29h0.651 c0.882,0,1.322-0.386,1.322-1.159c0-0.754-0.44-1.132-1.322-1.132H16.738z"/><path fill="#e72636" d="M21.528,29.521v-7.348h2.603c2.61,0,3.914,1.194,3.914,3.581c0,1.145-0.356,2.058-1.068,2.741 c-0.712,0.684-1.661,1.025-2.846,1.025H21.528z M23.183,23.521v4.657h0.82c0.717,0,1.279-0.215,1.688-0.645 c0.408-0.43,0.612-1.016,0.612-1.758c0-0.7-0.202-1.251-0.606-1.652c-0.405-0.402-0.973-0.602-1.704-0.602H23.183z"/><path fill="#e72636" d="M33.514,23.521h-2.593v1.803h2.383v1.343h-2.383v2.854h-1.655v-7.348h4.248V23.521z"/></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-ppt.svg b/datamodels/2.x/itop-attachments/icons/icons8-ppt.svg
new file mode 100644
index 0000000000..9bff9434d4
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-ppt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="480px" height="480px"><path fill="#FF6D00" d="M40 45L8 45 8 3 30 3 40 13z"/><path fill="#FFF3E0" d="M38.5 14L29 14 29 4.5z"/><path fill="#FFF" d="M23.4,29.5V33h-2V23h3.4c1,0,1.8,0.3,2.4,0.9c0.6,0.6,0.9,1.4,0.9,2.4c0,1-0.3,1.7-0.9,2.3c-0.6,0.6-1.4,0.8-2.4,0.8H23.4z M23.4,27.8h1.4c0.4,0,0.7-0.1,0.9-0.4c0.2-0.3,0.3-0.6,0.3-1.1c0-0.5-0.1-0.9-0.3-1.2c-0.2-0.3-0.5-0.4-0.9-0.4h-1.4V27.8z M15,29.5V33h-2V23h3.4c1,0,1.8,0.3,2.4,0.9c0.6,0.6,0.9,1.4,0.9,2.4s-0.3,1.7-0.9,2.3c-0.6,0.6-1.4,0.8-2.4,0.8H15z M15,27.8h1.4c0.4,0,0.7-0.1,0.9-0.4c0.2-0.3,0.3-0.6,0.3-1.1c0-0.5-0.1-0.9-0.3-1.2c-0.2-0.3-0.5-0.4-0.9-0.4H15V27.8z M36,24.7h-2.5V33h-2v-8.3h-2.4V23H36V24.7z"/></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-sql.svg b/datamodels/2.x/itop-attachments/icons/icons8-sql.svg
new file mode 100644
index 0000000000..7fd37ce62b
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-sql.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="480px" height="480px"><path fill="#D1C4E9" d="M41 4H7C5.895 4 5 4.895 5 6v8c0 1.105.895 2 2 2h34c1.105 0 2-.895 2-2V6C43 4.895 42.105 4 41 4M41 18H7c-1.105 0-2 .895-2 2v8c0 1.105.895 2 2 2h34c1.105 0 2-.895 2-2v-8C43 18.895 42.105 18 41 18M41 32H7c-1.105 0-2 .895-2 2v8c0 1.105.895 2 2 2h34c1.105 0 2-.895 2-2v-8C43 32.895 42.105 32 41 32"/><path fill="#D1C4E9" d="M24 8A16 16 0 1 0 24 40A16 16 0 1 0 24 8Z"/><g><path fill="#512DA8" d="M18.004 26.389c0-.405-.104-.712-.311-.919-.208-.208-.584-.423-1.131-.646-.998-.378-1.716-.821-2.153-1.33-.438-.508-.656-1.108-.656-1.801 0-.839.297-1.512.892-2.02.595-.509 1.35-.763 2.266-.763.611 0 1.155.129 1.634.386.479.258.847.621 1.104 1.091s.386 1.003.386 1.6h-2.003c0-.465-.099-.819-.297-1.063-.198-.243-.484-.365-.858-.365-.351 0-.625.104-.82.311-.196.208-.294.487-.294.838 0 .273.109.521.328.742.219.221.606.449 1.162.687.971.351 1.676.781 2.116 1.292s.66 1.16.66 1.948c0 .866-.276 1.543-.827 2.03s-1.301.731-2.249.731c-.643 0-1.228-.132-1.757-.396s-.942-.643-1.241-1.135-.448-1.073-.448-1.743h2.017c0 .574.112.991.335 1.251s.588.39 1.094.39C17.653 27.503 18.004 27.132 18.004 26.389zM28.36 24.796c0 1.646-.444 2.842-1.333 3.589l1.374 1.23-1.265 1.162-1.832-1.675-.526.034c-1.125 0-2.006-.382-2.642-1.146-.636-.763-.956-1.819-.96-3.168v-1.559c0-1.367.317-2.435.95-3.203.633-.768 1.513-1.151 2.639-1.151 1.099 0 1.966.369 2.604 1.107s.969 1.775.991 3.11V24.796zM26.344 23.251c0-.907-.13-1.577-.39-2.01s-.656-.649-1.189-.649-.927.211-1.183.632c-.255.422-.387 1.063-.396 1.925v1.647c0 .911.131 1.584.393 2.017s.662.649 1.2.649c.524 0 .915-.215 1.173-.646.257-.43.389-1.088.393-1.972V23.251zM31.819 27.332h3.527V29H29.81v-9.953h2.01V27.332z"/></g></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-txt.svg b/datamodels/2.x/itop-attachments/icons/icons8-txt.svg
new file mode 100644
index 0000000000..f06ea9823f
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-txt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="480px" height="480px"><path fill="#BA68C8" d="M41 45L9 45 9 3 31 3 41 13z"/><path fill="#F3E5F5" d="M39.5 14L30 14 30 4.5z"/><path fill="#4A148C" d="M21.246 24.722h-2.461V33h-2.017v-8.278h-2.42v-1.675h6.897V24.722zM25.519 26.465l1.34-3.418h2.304l-2.338 4.936L29.217 33h-2.331l-1.367-3.479L24.158 33h-2.331l2.393-5.018-2.345-4.936h2.304L25.519 26.465zM36.682 24.722h-2.461V33h-2.017v-8.278h-2.42v-1.675h6.897V24.722z"/></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-video-file.svg b/datamodels/2.x/itop-attachments/icons/icons8-video-file.svg
new file mode 100644
index 0000000000..67d450f722
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-video-file.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="480px" height="480px"><path fill="#90CAF9" d="M40 45L8 45 8 3 30 3 40 13z"/><path fill="#E1F5FE" d="M38.5 14L29 14 29 4.5z"/><path fill="#1976D2" d="M30 28L20 22 20 34z"/></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-word.svg b/datamodels/2.x/itop-attachments/icons/icons8-word.svg
new file mode 100644
index 0000000000..520adaba63
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-word.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="500px" height="500px"><path fill="#1976D2" d="M40 45L8 45 8 3 30 3 40 13z"/><path fill="#E3F2FD" d="M38.5 14L29 14 29 4.5z"/><path fill="#FAFAFA" d="M26.696,30.228l1.468-8.024h3.059L28.507,35h-3.199l-1.714-7.295L21.915,35h-3.19L16,22.203h3.067l1.468,8.024l1.758-8.024h2.619L26.696,30.228z"/></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-xls.svg b/datamodels/2.x/itop-attachments/icons/icons8-xls.svg
new file mode 100644
index 0000000000..bb7634c293
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-xls.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="480px" height="480px"><path fill="#388E3C" d="M40 45L8 45 8 3 30 3 40 13z"/><path fill="#E8F5E9" d="M38.5 14L29 14 29 4.5z"/><path fill="#FFF" d="M23.739,26.457l2.092-4.254h3.524l-3.577,6.346L29.452,35h-3.56l-2.153-4.333L21.586,35h-3.551l3.665-6.451l-3.568-6.346h3.516L23.739,26.457z"/></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/icons/icons8-xml-file.svg b/datamodels/2.x/itop-attachments/icons/icons8-xml-file.svg
new file mode 100644
index 0000000000..d327e5646d
--- /dev/null
+++ b/datamodels/2.x/itop-attachments/icons/icons8-xml-file.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="480px" height="480px"><path fill="#4db6ac" d="M40 45L8 45 8 3 30 3 40 13z"/><path fill="#e0f2f1" d="M38.5 14L29 14 29 4.5z"/><path fill="#00695c" d="M14.892 26.465l1.34-3.418h2.304l-2.338 4.936L18.59 33h-2.331l-1.367-3.479L13.532 33h-2.331l2.393-5.018-2.345-4.936h2.304L14.892 26.465zM22.934 23.047l1.88 7.198 1.873-7.198h2.625V33h-2.017v-2.693l.185-4.149L25.491 33h-1.367l-1.989-6.843.185 4.149V33h-2.01v-9.953H22.934zM33.635 31.332h3.527V33h-5.537v-9.953h2.01V31.332z"/></svg>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/main.itop-attachments.php b/datamodels/2.x/itop-attachments/main.itop-attachments.php
index 423d19c793..e0f5b9e879 100644
--- a/datamodels/2.x/itop-attachments/main.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/main.itop-attachments.php
@@ -367,30 +367,48 @@ class AttachmentPlugIn implements iApplicationUIExtension, iApplicationObjectExt
 		}
 		else
 		{
-			switch ($aPathParts['extension'])
+			switch (strtolower($aPathParts['extension']))
 			{
 				case 'doc':
 				case 'docx':
-					$sIcon = 'doc.png';
+					$sIcon = 'icons8-word.svg';
 					break;
 
 				case 'xls':
 				case 'xlsx':
-					$sIcon = 'xls.png';
+				case 'xlsm':
+					$sIcon = 'icons8-xls.svg';
 					break;
 
 				case 'ppt':
 				case 'pptx':
-					$sIcon = 'ppt.png';
+				case 'pps':
+					$sIcon = 'icons8-ppt.svg';
 					break;
 
+				case 'c':
+				case 'cgi':
+				case 'pl':
+				case 'class':
+				case 'cpp':
+				case 'cs':
+				case 'h':
+				case 'java':
+				case 'py':
+				case 'php':
+				case 'sh':
+				case 'swift':
+				case 'vb':
+					$sIcon = 'icons8-code-file.svg';
+					break;
+					
 				case 'pdf':
-					$sIcon = 'pdf.png';
+					$sIcon = 'icons8-pdf.svg';
 					break;
 
 				case 'txt':
 				case 'text':
-					$sIcon = 'txt.png';
+					$sIcon = 'icons8-txt.svg';
 					break;
 
 				case 'rtf':
@@ -398,20 +416,29 @@ class AttachmentPlugIn implements iApplicationUIExtension, iApplicationObjectExt
 					break;
 
 				case 'odt':
-					$sIcon = 'odt.png';
+					$sIcon = 'icons8-libre-office-writer.svg';
 					break;
 
 				case 'ods':
-					$sIcon = 'ods.png';
+					$sIcon = 'icons8-libre-office-calc.svg';
 					break;
 
 				case 'odp':
-					$sIcon = 'odp.png';
+					$sIcon = 'icons8-libre-office-impress.svg';
 					break;
 
+				case 'odb':
+					$sIcon = 'icons8-libre-office-base.svg';
+					break;
+
+				case 'odg':
+					$sIcon = 'icons8-libre-office-draw.svg';
+					break;
+
+				case 'xhtml':
 				case 'html':
 				case 'htm':
-					$sIcon = 'html.png';
+					$sIcon = 'icons8-html-filetype.svg';
 					break;
 
 				case 'png':
@@ -421,25 +448,76 @@ class AttachmentPlugIn implements iApplicationUIExtension, iApplicationObjectExt
 				case 'tiff':
 				case 'tif':
 				case 'bmp':
-					$sIcon = 'image.png';
-
+				case 'ico':
+				case 'psd':
+				case 'svg':
+				case 'ai':
+					$sIcon = 'icons8-image-file.svg';
 					break;
+					
 				case 'zip':
 				case 'gz':
 				case 'tgz':
 				case 'rar':
-					$sIcon = 'zip.png';
+				case '7z':
+				case 'pkg':
+				case 'tar':
+					$sIcon = 'icons8-archive-folder.svg';
 					break;
 
 				case 'avi':
 				case 'mp4':
 				case 'mpeg':
 				case 'mpg':
-					$sIcon = 'movie.png';
+				case 'h264':
+				case 'mkv':
+				case 'mov':
+				case 'm4v':
+				case 'wmv':
+					$sIcon = 'icons8-video-file.svg';
 					break;
 
+				case 'aif':
+				case 'cda':
+				case 'mid':
+				case 'midi':
+				case 'mp3':
+				case 'mpa':
+				case 'ogg':
+				case 'wav':
+				case 'wma':
+					$sIcon = 'icons8-audio-file.svg';
+					break;
+					
+				case 'csv':
+					$sIcon = 'icons8-csv.svg';
+					break;
+					
+				case 'log':
+					$sIcon = 'icons8-event-log.svg';
+					break;
+					
+				case 'sql':
+					$sIcon = 'icons8-sql.svg';
+					break;
+					
+				case 'xml':
+					$sIcon = 'icons8-xml-file.svg';
+					break;	
+					
+				case 'email':
+				case 'eml':
+				case 'emlx':
+				case 'msg':
+					$sIcon = 'icons8-mail.svg';
+					break;
+					
+				case 'patch':
+					$sIcon = 'icons8-bandage.svg';
+					break;
+					
 				default:
-					$sIcon = 'document.png';
+					$sIcon = 'icons8-file.svg';
 					break;
 			}
 		}