diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-bladder.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-bladder.svg
index 73ca8954a..acbc873d1 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-bladder.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-bladder.svg
@@ -1,10 +1,10 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_177)">
-<path d="M48.7465 24.8107C48.789 23.5132 49.305 22.2763 50.1972 21.3333L54.1012 17.4293L53.1412 16.4907L51.0079 14.3573L47.1039 18.0693C46.5692 18.5903 45.9283 18.9896 45.2251 19.2399C44.5218 19.4903 43.7728 19.5858 43.0292 19.52C39.832 17.8383 36.2737 16.9596 32.6612 16.9596C29.0487 16.9596 25.4904 17.8383 22.2932 19.52C21.5919 19.547 20.8924 19.4324 20.2363 19.1832C19.5802 18.9339 18.981 18.5551 18.4745 18.0693L14.5705 14.208L13.6319 15.168L11.4985 17.3013L15.2745 21.3333C16.18 22.2608 16.7052 23.4938 16.7465 24.7893C15.7474 26.406 15.2089 28.2649 15.1892 30.1653C15.1892 36.1173 20.5225 41.1307 27.7972 42.7093C28.5933 43.1612 29.2591 43.8111 29.73 44.596C30.201 45.381 30.4611 46.2743 30.4852 47.1893V52.7147H34.9225V47.1467C34.9552 46.2258 35.2258 45.3291 35.7081 44.544C36.1904 43.7589 36.8679 43.1121 37.6745 42.6667C38.3978 42.505 39.1103 42.2984 39.8079 42.048C45.8879 39.9147 50.0905 35.4347 50.1119 30.144C50.0728 28.2849 49.6055 26.4599 48.7465 24.8107Z" fill="white"/>
+<path d="M48.7465 24.8107C48.789 23.5132 49.305 22.2763 50.1972 21.3333L54.1012 17.4293L53.1412 16.4907L51.0079 14.3573L47.1039 18.0693C46.5692 18.5903 45.9283 18.9896 45.2251 19.2399C44.5218 19.4903 43.7728 19.5858 43.0292 19.52C39.832 17.8383 36.2737 16.9596 32.6612 16.9596C29.0487 16.9596 25.4904 17.8383 22.2932 19.52C21.5919 19.547 20.8924 19.4324 20.2363 19.1832C19.5802 18.9339 18.981 18.5551 18.4745 18.0693L14.5705 14.208L13.6319 15.168L11.4985 17.3013L15.2745 21.3333C16.18 22.2608 16.7052 23.4938 16.7465 24.7893C15.7474 26.406 15.2089 28.2649 15.1892 30.1653C15.1892 36.1173 20.5225 41.1307 27.7972 42.7093C28.5933 43.1612 29.2591 43.8111 29.73 44.596C30.201 45.381 30.4611 46.2743 30.4852 47.1893V52.7147H34.9225V47.1467C34.9552 46.2258 35.2258 45.3291 35.7081 44.544C36.1904 43.7589 36.8679 43.1121 37.6745 42.6667C38.3978 42.505 39.1103 42.2984 39.8079 42.048C45.8879 39.9147 50.0905 35.4347 50.1119 30.144C50.0728 28.2849 49.6055 26.4599 48.7465 24.8107Z"/>
 </g>
 <defs>
 <clipPath id="clip0_1795_177">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-blood.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-blood.svg
index 5d36266dc..3c42b438e 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-blood.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-blood.svg
@@ -1,15 +1,15 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_181)">
-<path d="M21.0717 6.76266C18.2824 4.74371 13.2867 6.86567 9.89373 11.4598C6.50078 16.054 6.02203 21.4104 8.81132 23.4087C11.6006 25.4071 16.5964 23.3263 19.9893 18.7322C23.3823 14.138 23.861 8.78161 21.0717 6.76266ZM18.9693 15.3123C18.8653 15.4565 18.6779 15.5183 18.5114 15.4565C18.5114 15.4565 18.4906 15.4565 18.4698 15.4565C18.3032 15.3329 18.2616 15.1063 18.3865 14.9415C19.3857 13.2522 19.4273 12.1397 19.24 11.9955C19.0526 11.8512 18.4906 11.9543 17.658 12.4899C16.5756 13.2316 15.618 14.1174 14.8062 15.1269C12.7247 17.7639 12.4124 19.9683 12.5789 20.1125C12.7455 20.2567 13.4532 20.1537 14.6605 19.2266C14.8062 19.0824 15.056 19.0824 15.1809 19.2266C15.3266 19.3708 15.3266 19.5974 15.1809 19.7416C13.8071 20.8129 12.5165 20.9777 12.1002 20.6275C11.6839 20.2773 11.6214 19.6592 11.8296 18.8764C12.35 17.3519 13.1618 15.951 14.2234 14.7561C15.0768 13.6436 16.0968 12.6753 17.2208 11.8512C18.6155 10.9654 19.3232 11.1096 19.6979 11.398C20.697 12.2221 19.5522 14.4264 18.9485 15.3329L18.9693 15.3123Z" fill="white"/>
+<path d="M21.0717 6.76266C18.2824 4.74371 13.2867 6.86567 9.89373 11.4598C6.50078 16.054 6.02203 21.4104 8.81132 23.4087C11.6006 25.4071 16.5964 23.3263 19.9893 18.7322C23.3823 14.138 23.861 8.78161 21.0717 6.76266ZM18.9693 15.3123C18.8653 15.4565 18.6779 15.5183 18.5114 15.4565C18.5114 15.4565 18.4906 15.4565 18.4698 15.4565C18.3032 15.3329 18.2616 15.1063 18.3865 14.9415C19.3857 13.2522 19.4273 12.1397 19.24 11.9955C19.0526 11.8512 18.4906 11.9543 17.658 12.4899C16.5756 13.2316 15.618 14.1174 14.8062 15.1269C12.7247 17.7639 12.4124 19.9683 12.5789 20.1125C12.7455 20.2567 13.4532 20.1537 14.6605 19.2266C14.8062 19.0824 15.056 19.0824 15.1809 19.2266C15.3266 19.3708 15.3266 19.5974 15.1809 19.7416C13.8071 20.8129 12.5165 20.9777 12.1002 20.6275C11.6839 20.2773 11.6214 19.6592 11.8296 18.8764C12.35 17.3519 13.1618 15.951 14.2234 14.7561C15.0768 13.6436 16.0968 12.6753 17.2208 11.8512C18.6155 10.9654 19.3232 11.1096 19.6979 11.398C20.697 12.2221 19.5522 14.4264 18.9485 15.3329L18.9693 15.3123Z" />
 <path d="M34.0811 44.5867L34.1435 44.6073H34.0811V44.5867Z" fill="black"/>
-<path d="M50.4006 15.0441C46.2375 10.9238 38.4316 11.9127 32.9988 17.2897C30.5633 19.6177 28.9605 22.6667 28.3777 25.9629C29.5225 26.1895 31.167 26.7664 32.5824 27.5493C32.2702 26.684 32.2286 25.7569 32.4367 24.8504C32.4784 24.6238 32.7282 24.4796 32.9571 24.5208C32.9571 24.5208 32.9779 24.5208 32.9988 24.5208C33.2277 24.5826 33.3526 24.8092 33.2902 25.0359C32.8947 26.1483 33.1653 27.3638 33.9563 28.2291C34.8722 28.9502 36.1211 29.1562 37.2243 28.7235C38.9104 28.2291 40.4091 27.302 41.6164 26.0453C42.8862 24.8504 43.8229 23.3465 44.3225 21.6778C44.7596 20.5859 44.5722 19.3498 43.8229 18.4434C43.3858 18.0519 42.8237 17.8047 42.2409 17.7841C41.9911 17.7635 41.8246 17.5575 41.8454 17.3103C41.8454 17.0837 42.0536 16.8982 42.2825 16.8982C43.0735 16.96 43.8021 17.2897 44.3641 17.8253C45.3424 18.9584 45.6338 20.5447 45.0926 21.9456C44.5514 23.7586 43.5523 25.3861 42.1784 26.7046C40.8462 28.0643 39.2018 29.0532 37.37 29.6094C36.8913 29.733 36.1419 29.7948 35.6423 29.8154C35.6007 29.7948 35.5591 29.733 35.5174 29.7124C37.37 31.3605 37.9529 32.4524 38.6606 34.5744C39.0145 35.6251 39.0145 36.2431 39.0145 36.2431C39.0145 36.2431 43.8021 36.3667 49.3807 30.7219C49.797 30.2893 50.1925 29.8154 50.5255 29.321C53.7519 24.356 53.856 18.464 50.4006 15.0441Z" fill="white"/>
-<path d="M26.0671 25.9629C18.5942 24.974 11.9749 28.4351 11.2671 33.6885C10.5594 38.9419 16.0339 44.0305 23.4859 45.0194C30.9587 46.0082 37.5781 42.5472 38.2858 37.2938C38.9936 32.0404 33.5191 26.9518 26.0671 25.9629ZM24.2977 39.0449C19.4893 38.4062 16.0131 35.8929 16.3462 33.4207C16.5335 31.958 18.1571 30.7219 20.6758 30.2274C20.9464 30.1862 21.1962 30.3716 21.2378 30.6189C21.2795 30.8661 21.1129 31.1339 20.8631 31.1751C18.8024 31.5665 17.4286 32.4524 17.2829 33.5237C17.0331 35.3778 20.3219 37.4174 24.4226 37.9736C28.5233 38.5093 32.2285 37.4174 32.4783 35.5426C32.6032 34.698 32.062 33.8533 31.042 33.0704C30.8338 32.9056 30.7714 32.6172 30.9171 32.3906C31.0836 32.1846 31.375 32.1434 31.5832 32.3082C32.7697 32.988 33.4774 34.2653 33.4358 35.6044C33.1027 38.0766 29.0645 39.6629 24.2561 39.0243L24.2977 39.0449Z" fill="white"/>
-<path d="M33.2692 44.9987C31.8746 44.4425 31.5623 45.6168 31.4791 45.8228C31.375 46.0494 31.4791 46.5027 32.2493 47.2031C33.2484 48.0478 34.3516 48.7482 35.5381 49.2633C38.6605 50.7672 40.7629 50.4582 40.8669 50.2315C40.971 50.0049 40.7004 49.3251 39.4723 48.3568C39.3266 48.192 39.3266 47.9654 39.4723 47.8006C39.4723 47.8006 39.4931 47.78 39.5139 47.7594C39.6596 47.6357 39.8886 47.6564 40.0135 47.8006C41.3873 48.8924 41.9493 49.9019 41.6371 50.623C41.2832 51.1792 40.6171 51.4676 39.9719 51.3646C38.3274 51.241 36.7246 50.7878 35.2675 50.0461C33.9978 49.4487 32.8321 48.6864 31.7913 47.7594C30.5632 46.6057 30.4383 46.1318 30.7089 45.5138C30.7714 45.3696 31.0836 45.2048 30.9587 45.143C30.8754 45.1018 30.5632 45.2254 30.355 45.2872C29.3559 45.5756 28.8355 45.6168 27.8155 45.7198L26.5458 45.8022C25.5883 48.9336 28.8147 52.8891 33.9978 54.9081C39.3474 56.9889 44.697 56.0824 45.9668 52.8479C46.4663 51.035 45.8002 48.8512 44.5513 47.4297C44.4889 47.3679 44.4056 47.3267 44.3223 47.3473C43.8852 47.4091 42.4489 47.6563 40.6588 47.5327C39.2849 47.4503 36.9328 47.0383 33.6855 45.2254L33.2692 45.0194V44.9987Z" fill="white"/>
-<path d="M49.214 31.7932C48.8602 32.1434 47.7153 33.1117 47.7153 33.1117C47.7153 33.1117 50.3589 34.4508 50.2756 37.0672C50.1091 39.56 47.0076 41.6201 43.2191 41.6201H42.5739C40.9294 41.5583 39.3266 41.0639 37.932 40.178H37.8903C37.1826 41.2905 36.2251 42.2588 35.101 43.0416C35.101 43.0416 33.4358 44.0717 33.4358 44.2365C33.4358 44.3601 34.0394 44.6485 34.0394 44.6485C34.6223 44.9576 35.33 45.3078 35.9129 45.6168C37.5573 46.2349 39.4723 46.9559 41.2208 46.9559C42.9694 46.9559 44.7387 46.7087 44.7387 46.7087C51.1083 46.0082 55.9791 42.197 55.9791 37.6234C55.7085 34.3684 53.6686 31.5459 50.6711 30.2274C50.6295 30.2274 50.5671 30.3717 50.3173 30.5983C50.3173 30.5983 49.5887 31.3811 49.1932 31.7726L49.214 31.7932ZM47.07 33.7297C45.9044 34.5538 44.7803 35.316 42.449 36.2431C41.2833 36.7169 39.5556 36.8199 39.1809 36.8199C39.1393 36.8199 39.0976 36.8612 39.0976 36.9024C38.9727 37.7676 38.6605 38.6741 38.3275 39.3951H38.3691C39.618 40.1986 41.1168 40.5694 42.5947 40.6518H43.1983C46.4456 40.6518 49.1932 39.1479 49.3181 37.0878C49.5471 35.7693 48.3398 34.3066 47.0908 33.7297H47.07Z" fill="white"/>
+<path d="M50.4006 15.0441C46.2375 10.9238 38.4316 11.9127 32.9988 17.2897C30.5633 19.6177 28.9605 22.6667 28.3777 25.9629C29.5225 26.1895 31.167 26.7664 32.5824 27.5493C32.2702 26.684 32.2286 25.7569 32.4367 24.8504C32.4784 24.6238 32.7282 24.4796 32.9571 24.5208C32.9571 24.5208 32.9779 24.5208 32.9988 24.5208C33.2277 24.5826 33.3526 24.8092 33.2902 25.0359C32.8947 26.1483 33.1653 27.3638 33.9563 28.2291C34.8722 28.9502 36.1211 29.1562 37.2243 28.7235C38.9104 28.2291 40.4091 27.302 41.6164 26.0453C42.8862 24.8504 43.8229 23.3465 44.3225 21.6778C44.7596 20.5859 44.5722 19.3498 43.8229 18.4434C43.3858 18.0519 42.8237 17.8047 42.2409 17.7841C41.9911 17.7635 41.8246 17.5575 41.8454 17.3103C41.8454 17.0837 42.0536 16.8982 42.2825 16.8982C43.0735 16.96 43.8021 17.2897 44.3641 17.8253C45.3424 18.9584 45.6338 20.5447 45.0926 21.9456C44.5514 23.7586 43.5523 25.3861 42.1784 26.7046C40.8462 28.0643 39.2018 29.0532 37.37 29.6094C36.8913 29.733 36.1419 29.7948 35.6423 29.8154C35.6007 29.7948 35.5591 29.733 35.5174 29.7124C37.37 31.3605 37.9529 32.4524 38.6606 34.5744C39.0145 35.6251 39.0145 36.2431 39.0145 36.2431C39.0145 36.2431 43.8021 36.3667 49.3807 30.7219C49.797 30.2893 50.1925 29.8154 50.5255 29.321C53.7519 24.356 53.856 18.464 50.4006 15.0441Z" />
+<path d="M26.0671 25.9629C18.5942 24.974 11.9749 28.4351 11.2671 33.6885C10.5594 38.9419 16.0339 44.0305 23.4859 45.0194C30.9587 46.0082 37.5781 42.5472 38.2858 37.2938C38.9936 32.0404 33.5191 26.9518 26.0671 25.9629ZM24.2977 39.0449C19.4893 38.4062 16.0131 35.8929 16.3462 33.4207C16.5335 31.958 18.1571 30.7219 20.6758 30.2274C20.9464 30.1862 21.1962 30.3716 21.2378 30.6189C21.2795 30.8661 21.1129 31.1339 20.8631 31.1751C18.8024 31.5665 17.4286 32.4524 17.2829 33.5237C17.0331 35.3778 20.3219 37.4174 24.4226 37.9736C28.5233 38.5093 32.2285 37.4174 32.4783 35.5426C32.6032 34.698 32.062 33.8533 31.042 33.0704C30.8338 32.9056 30.7714 32.6172 30.9171 32.3906C31.0836 32.1846 31.375 32.1434 31.5832 32.3082C32.7697 32.988 33.4774 34.2653 33.4358 35.6044C33.1027 38.0766 29.0645 39.6629 24.2561 39.0243L24.2977 39.0449Z" />
+<path d="M33.2692 44.9987C31.8746 44.4425 31.5623 45.6168 31.4791 45.8228C31.375 46.0494 31.4791 46.5027 32.2493 47.2031C33.2484 48.0478 34.3516 48.7482 35.5381 49.2633C38.6605 50.7672 40.7629 50.4582 40.8669 50.2315C40.971 50.0049 40.7004 49.3251 39.4723 48.3568C39.3266 48.192 39.3266 47.9654 39.4723 47.8006C39.4723 47.8006 39.4931 47.78 39.5139 47.7594C39.6596 47.6357 39.8886 47.6564 40.0135 47.8006C41.3873 48.8924 41.9493 49.9019 41.6371 50.623C41.2832 51.1792 40.6171 51.4676 39.9719 51.3646C38.3274 51.241 36.7246 50.7878 35.2675 50.0461C33.9978 49.4487 32.8321 48.6864 31.7913 47.7594C30.5632 46.6057 30.4383 46.1318 30.7089 45.5138C30.7714 45.3696 31.0836 45.2048 30.9587 45.143C30.8754 45.1018 30.5632 45.2254 30.355 45.2872C29.3559 45.5756 28.8355 45.6168 27.8155 45.7198L26.5458 45.8022C25.5883 48.9336 28.8147 52.8891 33.9978 54.9081C39.3474 56.9889 44.697 56.0824 45.9668 52.8479C46.4663 51.035 45.8002 48.8512 44.5513 47.4297C44.4889 47.3679 44.4056 47.3267 44.3223 47.3473C43.8852 47.4091 42.4489 47.6563 40.6588 47.5327C39.2849 47.4503 36.9328 47.0383 33.6855 45.2254L33.2692 45.0194V44.9987Z" />
+<path d="M49.214 31.7932C48.8602 32.1434 47.7153 33.1117 47.7153 33.1117C47.7153 33.1117 50.3589 34.4508 50.2756 37.0672C50.1091 39.56 47.0076 41.6201 43.2191 41.6201H42.5739C40.9294 41.5583 39.3266 41.0639 37.932 40.178H37.8903C37.1826 41.2905 36.2251 42.2588 35.101 43.0416C35.101 43.0416 33.4358 44.0717 33.4358 44.2365C33.4358 44.3601 34.0394 44.6485 34.0394 44.6485C34.6223 44.9576 35.33 45.3078 35.9129 45.6168C37.5573 46.2349 39.4723 46.9559 41.2208 46.9559C42.9694 46.9559 44.7387 46.7087 44.7387 46.7087C51.1083 46.0082 55.9791 42.197 55.9791 37.6234C55.7085 34.3684 53.6686 31.5459 50.6711 30.2274C50.6295 30.2274 50.5671 30.3717 50.3173 30.5983C50.3173 30.5983 49.5887 31.3811 49.1932 31.7726L49.214 31.7932ZM47.07 33.7297C45.9044 34.5538 44.7803 35.316 42.449 36.2431C41.2833 36.7169 39.5556 36.8199 39.1809 36.8199C39.1393 36.8199 39.0976 36.8612 39.0976 36.9024C38.9727 37.7676 38.6605 38.6741 38.3275 39.3951H38.3691C39.618 40.1986 41.1168 40.5694 42.5947 40.6518H43.1983C46.4456 40.6518 49.1932 39.1479 49.3181 37.0878C49.5471 35.7693 48.3398 34.3066 47.0908 33.7297H47.07Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_181">
-<rect width="49" height="50" fill="white" transform="translate(7 6)"/>
+<rect width="49" height="50"  transform="translate(7 6)"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-bone-marrow.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-bone-marrow.svg
index 7244ec7c0..fc5a02e5f 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-bone-marrow.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-bone-marrow.svg
@@ -1,10 +1,10 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_188)">
-<path d="M48.7718 9.47917C48.3724 9 47.9309 8.5625 47.4474 8.1875C45.6817 6.79167 43.4955 6.02083 41.2462 6C38.4715 6.02083 35.8228 7.1875 33.952 9.25C33.6997 9.54167 33.4685 9.83333 33.2372 10.1458C32.4595 11.0833 31.3243 11.6667 30.1051 11.7708C28.8228 11.7083 27.6246 11.125 26.8048 10.1458C26.5946 9.83333 26.3634 9.52083 26.0901 9.25C24.2402 7.1875 21.5495 6 18.7538 6C13.4144 6 9.06306 10.25 9 15.5417C9 15.9167 9 16.3125 9 16.6875C9.3994 21.3958 12.1111 25.2083 15.3063 29.5625C17.1141 32.3542 18.2282 35.5208 18.5856 38.8125V56H41.3934V38.8125C41.7507 35.5208 42.8649 32.3542 44.6727 29.5625C47.8679 25.2083 50.5796 21.3958 50.979 16.6875C50.979 16.3125 50.979 15.9167 50.979 15.5417C50.979 13.3333 50.1802 11.1667 48.7507 9.47917H48.7718ZM38.7658 12.2708C40.1321 12.2708 41.4565 12.7292 42.5285 13.5833C42.8228 13.8125 43.0961 14.0833 43.3273 14.375C43.4535 14.4792 43.5586 14.5833 43.6426 14.7083C41.8769 13.6667 39.964 12.8542 37.988 12.2708H38.7658ZM44.2102 17.5C43.1802 17.4167 42.1502 17.5833 41.1832 17.9375L40.994 18.0625C41.0781 16.8333 40.7628 15.6042 40.1111 14.5625C41.1622 15.125 42.8228 15.9375 43.033 16.125C43.4955 16.5208 43.8949 16.9792 44.2102 17.5ZM37.5465 14.25C37.988 14.5208 38.3453 14.8542 38.6396 15.2708C39.2703 16.125 39.5646 17.1667 39.4384 18.2083C39.1441 18.875 38.7237 19.4792 38.1982 20L37.8408 20.6667L37.6306 21.0833V21.1875C37.1892 21 36.7688 20.7708 36.3694 20.5208C36.2012 20.4375 36.0541 20.3333 35.9069 20.2292L35.7177 20.0625C35.5916 19.9375 35.4655 19.8125 35.3604 19.6667C35.3604 19.625 35.3604 19.6042 35.3604 19.5625V19.4375L35.4234 19.5C35.8859 19.1042 36.2853 18.625 36.5796 18.0833C37.1682 16.8958 37.5045 15.5833 37.5465 14.25ZM31.3033 28.5208C30.8408 28.75 30.3994 29.0208 30 29.3333L28.9279 30.0417C28.9069 29.8958 28.8649 29.7708 28.8018 29.6458C29.5586 29.1458 30.1261 28.4167 30.4204 27.5625C30.6516 26.7083 30.3363 25.6458 31.03 24.9375C31.1982 24.7708 31.3874 24.625 31.5766 24.5C32.018 25.3333 32.6697 26.0417 33.4474 26.5833C34.3514 27.2083 35.3393 27.7292 36.3904 28.0833H36.6006C37 28.625 37.2943 29.2292 37.4204 29.8958C36.1592 29.5417 35.003 28.8333 33.7417 28.5208C32.9429 28.2917 32.1021 28.2917 31.3033 28.5208ZM33.4895 30.25C33.2583 30.8333 32.985 31.375 32.7117 31.9375C31.976 31.5 31.1141 31.25 30.2523 31.2292L30.5886 31.0208C30.9459 30.7292 31.3243 30.4583 31.7447 30.25C32.3123 30.0625 32.9219 30.0625 33.4895 30.25ZM26.5315 26.375C26.5946 25.8542 26.7207 25.3542 26.952 24.8958C27.3724 23.8542 28.045 22.9167 28.9489 22.2292C30.042 21.5208 31.1982 20.9167 32.3964 20.4375C32.5435 20.4583 32.6697 20.4583 32.8168 20.4375C33.2162 20.4375 33.6156 20.3542 33.994 20.2083C34.1832 20.5417 34.4144 20.8333 34.6877 21.1042L32.5856 22.1042C31.6607 22.4792 30.7778 22.9792 29.979 23.6042C29.2222 24.3125 28.8018 25.3125 28.8649 26.3333C28.8649 26.7708 28.7808 27.1875 28.5916 27.5833C28.4234 27.8333 28.2132 28.0625 27.961 28.2708L27.5195 27.7083C27.1201 27.2708 26.5315 27.0208 26.5315 26.375ZM27.3724 31.9375C26.7417 32.3542 26.1952 32.8542 25.7538 33.4583L24.8288 32.6458C25.5646 31.5417 26.0901 30.2917 26.3844 29C27.0781 29.8333 27.4144 30.875 27.3724 31.9375ZM37.021 25.4583L36.7688 25.7917L36.6426 25.9583C36.5375 26.0625 36.4535 26.1667 36.3694 26.2917L35.8438 26.0625C35.3393 25.8125 34.8559 25.5417 34.3934 25.2292C33.973 24.9583 33.5946 24.6458 33.2583 24.2917C33.1111 24.1458 33.006 23.9792 32.9009 23.8125L33.3423 23.6042L36.1592 22.2917L37.4835 22.9375C37.4835 22.9375 37.6727 22.9583 37.7778 22.9375C37.8198 23.2917 37.9459 23.625 38.1141 23.9375L38.03 23.9792C37.7147 24.4792 37.3784 24.9792 37.021 25.4583ZM33.7628 14.8125C33.8889 14.625 34.036 14.4375 34.1832 14.2708C34.5616 13.8958 34.982 13.5625 35.4234 13.2708H35.8649C35.8649 14.3958 35.6757 15.5417 35.2973 16.6042L35.0661 16.4792L34.8348 16.3125L34.4565 16C34.2042 15.7708 33.973 15.5208 33.7628 15.2708H33.6156L33.4895 15.125L33.7628 14.8125ZM27.982 16C28.6547 16.4167 29.4324 16.6667 30.2312 16.6875C30.967 16.6458 31.7027 16.4375 32.3333 16.0417C32.9009 16.8333 33.6156 17.5 34.4354 18H34.5616C34.2883 18.2708 33.973 18.4792 33.6366 18.6458C33.2162 18.9167 32.6697 18.9167 32.2492 18.6458C31.9339 18.3125 31.5976 18.0208 31.2402 17.7292C30.5045 17.2917 29.6637 17.0417 28.8018 17.0417C28.3393 16.6875 27.7928 16.4583 27.2042 16.375L27.982 16ZM30.3153 19.0625C30.5045 19.1667 30.6517 19.2917 30.7988 19.4375C29.8739 19.6667 28.97 19.9792 28.1081 20.375C27.3934 20.875 26.7417 21.5 26.2372 22.2083L26.1321 22.0833L25.964 21.8125C25.7958 21.5833 25.6486 21.3542 25.5435 21.1042V20.9792C25.4384 20.8333 25.4384 20.6667 25.4384 20.5417V20.4167C25.4384 20.2708 25.4384 20.1042 25.4384 19.9583C26.6997 18.6458 28.6757 18.2708 30.3153 19.0625ZM21.5706 12.375C23.2733 12.375 24.8919 13.0833 26.027 14.3333C26.1952 14.5208 26.3423 14.7292 26.4895 14.9375H26.5946C26.1111 15.1458 25.6276 15.3333 25.1231 15.4583C23.5045 15.7083 21.8649 15.3333 20.5195 14.4375C19.8048 14.0208 19.1321 13.5625 18.4174 13.1875C19.3634 12.625 20.4565 12.3542 21.5706 12.375ZM17.0511 14.3542L17.3664 14.5H17.3874L16.1051 15.8125C16.3363 15.2708 16.6517 14.7917 17.0511 14.3542ZM15.7688 18.6042V18.4583L16.0631 18.1667C17.6396 20.375 18.5435 22.9792 18.7117 25.6875C17.1141 23.625 16.1051 21.1875 15.7688 18.6042ZM18.8378 19.4583V19.6458C18.3544 18.7083 17.7658 17.8333 17.0721 17.0208L18.7327 15.3333C19.4054 15.7708 20.0991 16.1458 20.8348 16.4583C20.3934 16.6667 19.994 16.9792 19.6787 17.375C19.3213 18.0417 19.048 18.7292 18.8378 19.4583ZM20.6246 19.7708L20.982 18.8333C21.0661 18.5625 21.1712 18.3125 21.2973 18.0833C21.3183 18.0208 21.3604 17.9583 21.4024 17.9167L21.6547 17.6667H21.7808C21.8859 17.6042 22.012 17.5417 22.1381 17.4792H22.2853L22.6216 17.3542L23.1892 17.2292C23.4204 17.4167 23.6727 17.5833 23.9459 17.7083C24.5135 17.8125 25.1021 17.875 25.6907 17.8542C24.9339 18.25 24.2613 18.7917 23.7147 19.4375C23.2523 20.1667 22.8739 20.9375 22.6216 21.75C22.012 22.4375 21.1712 22.8958 20.2673 23.0625C20.1622 22.5625 20.036 22.0833 19.9099 21.6042C20.1411 21 20.3724 20.375 20.6246 19.7708ZM20.2042 25.0625C21.2342 24.7708 22.2012 24.2708 23.0631 23.625C23.5676 23.1458 23.9459 22.5625 24.1562 21.8958C24.1772 22 24.2192 22.1042 24.2613 22.1875C24.4084 22.4583 24.5766 22.7083 24.7447 22.9583C24.9339 23.2917 25.2072 23.5833 25.5225 23.8125H25.6486C25.3333 24.3958 25.1231 25.0417 24.997 25.6875V25.9583C24.8709 25.8542 24.7447 25.75 24.5976 25.6875C23.988 25.4792 23.3363 25.4792 22.7267 25.6875C22.1592 25.8542 21.6757 26.1875 21.0871 26.4792C20.8559 26.5833 20.6036 26.6458 20.3514 26.7083C20.3303 26.1667 20.2042 25.6042 20.2042 25.0625ZM20.5616 28.2083C20.8138 28.1667 21.045 28.125 21.2763 28.0417C21.8018 27.8333 22.3273 27.6042 22.8318 27.3333C23.1471 27.1458 23.5255 27.0625 23.8829 27.0833C24.009 27.125 24.1351 27.1875 24.2402 27.2708L24.7237 27.7708C24.7237 27.7708 24.8288 27.9167 24.8919 27.9583C24.7027 28.6667 24.5135 29.3542 24.2823 30.0417C24.2402 30.2083 24.1772 30.375 24.1141 30.5417V30.6875L23.988 30.9583C23.9039 31.1042 23.8198 31.25 23.7147 31.3958C23.7147 31.4375 23.6727 31.4792 23.6517 31.5208L21.2763 29.4375C21.0661 29.0208 20.8138 28.6042 20.5616 28.2083ZM23.021 35.375C22.8739 34.4375 22.6847 33.5208 22.4324 32.6042L24.9339 34.75C24.3243 35.0208 23.6727 35.2292 23.021 35.375ZM34.8769 39.9583V54.5417L25.3754 54.3958V39.8125C25.1231 36.9167 27.2252 34.3542 30.1261 34.0208H30.1682C33.1111 34.375 35.2132 37.0208 34.8769 39.9583ZM37.3784 35.0833C37.2102 34.9375 37.042 34.7708 36.8739 34.6458C35.991 33.9792 35.045 33.4167 34.015 33C34.3934 32.25 34.7087 31.4792 35.003 30.7083C35.8649 31.1042 36.7688 31.3958 37.6937 31.5833C37.7778 31.8333 37.8829 32.0833 37.988 32.3333C37.7147 33.2292 37.5045 34.1458 37.3784 35.0833ZM40.0901 27.7708C39.6276 28.4167 39.2282 29.125 38.9129 29.8542C38.7658 28.8542 38.4084 27.9167 37.8198 27.0833C38.2823 26.4792 38.7447 25.8542 39.1652 25.2083C39.5225 25.5208 39.9009 25.7917 40.3003 26.0417C40.5315 26.2083 40.7838 26.3542 41.036 26.4792C40.7417 26.8958 40.4264 27.3333 40.0901 27.7708ZM41.9399 25.1875C41.4985 24.9167 41.0571 24.6667 40.6156 24.3542C39.6276 23.6875 38.997 22.8125 39.6276 21.6042L39.7538 21.3958C39.9009 21.0625 40.1532 20.7708 40.4474 20.5625C40.5946 20.4375 40.7417 20.3333 40.9099 20.2292C41.6456 21.1458 42.4024 22.2292 43.1381 23.2292C42.8018 23.8542 42.4024 24.5 41.9399 25.1875ZM43.8949 21.625C43.3273 20.8542 42.7808 20.0625 42.2132 19.2708C42.4865 19.2083 42.7808 19.1458 43.0541 19.125C43.5586 19.0625 44.0631 19.0625 44.5676 19.125C44.4625 19.9792 44.2312 20.8333 43.8949 21.625Z" fill="white"/>
+<path d="M48.7718 9.47917C48.3724 9 47.9309 8.5625 47.4474 8.1875C45.6817 6.79167 43.4955 6.02083 41.2462 6C38.4715 6.02083 35.8228 7.1875 33.952 9.25C33.6997 9.54167 33.4685 9.83333 33.2372 10.1458C32.4595 11.0833 31.3243 11.6667 30.1051 11.7708C28.8228 11.7083 27.6246 11.125 26.8048 10.1458C26.5946 9.83333 26.3634 9.52083 26.0901 9.25C24.2402 7.1875 21.5495 6 18.7538 6C13.4144 6 9.06306 10.25 9 15.5417C9 15.9167 9 16.3125 9 16.6875C9.3994 21.3958 12.1111 25.2083 15.3063 29.5625C17.1141 32.3542 18.2282 35.5208 18.5856 38.8125V56H41.3934V38.8125C41.7507 35.5208 42.8649 32.3542 44.6727 29.5625C47.8679 25.2083 50.5796 21.3958 50.979 16.6875C50.979 16.3125 50.979 15.9167 50.979 15.5417C50.979 13.3333 50.1802 11.1667 48.7507 9.47917H48.7718ZM38.7658 12.2708C40.1321 12.2708 41.4565 12.7292 42.5285 13.5833C42.8228 13.8125 43.0961 14.0833 43.3273 14.375C43.4535 14.4792 43.5586 14.5833 43.6426 14.7083C41.8769 13.6667 39.964 12.8542 37.988 12.2708H38.7658ZM44.2102 17.5C43.1802 17.4167 42.1502 17.5833 41.1832 17.9375L40.994 18.0625C41.0781 16.8333 40.7628 15.6042 40.1111 14.5625C41.1622 15.125 42.8228 15.9375 43.033 16.125C43.4955 16.5208 43.8949 16.9792 44.2102 17.5ZM37.5465 14.25C37.988 14.5208 38.3453 14.8542 38.6396 15.2708C39.2703 16.125 39.5646 17.1667 39.4384 18.2083C39.1441 18.875 38.7237 19.4792 38.1982 20L37.8408 20.6667L37.6306 21.0833V21.1875C37.1892 21 36.7688 20.7708 36.3694 20.5208C36.2012 20.4375 36.0541 20.3333 35.9069 20.2292L35.7177 20.0625C35.5916 19.9375 35.4655 19.8125 35.3604 19.6667C35.3604 19.625 35.3604 19.6042 35.3604 19.5625V19.4375L35.4234 19.5C35.8859 19.1042 36.2853 18.625 36.5796 18.0833C37.1682 16.8958 37.5045 15.5833 37.5465 14.25ZM31.3033 28.5208C30.8408 28.75 30.3994 29.0208 30 29.3333L28.9279 30.0417C28.9069 29.8958 28.8649 29.7708 28.8018 29.6458C29.5586 29.1458 30.1261 28.4167 30.4204 27.5625C30.6516 26.7083 30.3363 25.6458 31.03 24.9375C31.1982 24.7708 31.3874 24.625 31.5766 24.5C32.018 25.3333 32.6697 26.0417 33.4474 26.5833C34.3514 27.2083 35.3393 27.7292 36.3904 28.0833H36.6006C37 28.625 37.2943 29.2292 37.4204 29.8958C36.1592 29.5417 35.003 28.8333 33.7417 28.5208C32.9429 28.2917 32.1021 28.2917 31.3033 28.5208ZM33.4895 30.25C33.2583 30.8333 32.985 31.375 32.7117 31.9375C31.976 31.5 31.1141 31.25 30.2523 31.2292L30.5886 31.0208C30.9459 30.7292 31.3243 30.4583 31.7447 30.25C32.3123 30.0625 32.9219 30.0625 33.4895 30.25ZM26.5315 26.375C26.5946 25.8542 26.7207 25.3542 26.952 24.8958C27.3724 23.8542 28.045 22.9167 28.9489 22.2292C30.042 21.5208 31.1982 20.9167 32.3964 20.4375C32.5435 20.4583 32.6697 20.4583 32.8168 20.4375C33.2162 20.4375 33.6156 20.3542 33.994 20.2083C34.1832 20.5417 34.4144 20.8333 34.6877 21.1042L32.5856 22.1042C31.6607 22.4792 30.7778 22.9792 29.979 23.6042C29.2222 24.3125 28.8018 25.3125 28.8649 26.3333C28.8649 26.7708 28.7808 27.1875 28.5916 27.5833C28.4234 27.8333 28.2132 28.0625 27.961 28.2708L27.5195 27.7083C27.1201 27.2708 26.5315 27.0208 26.5315 26.375ZM27.3724 31.9375C26.7417 32.3542 26.1952 32.8542 25.7538 33.4583L24.8288 32.6458C25.5646 31.5417 26.0901 30.2917 26.3844 29C27.0781 29.8333 27.4144 30.875 27.3724 31.9375ZM37.021 25.4583L36.7688 25.7917L36.6426 25.9583C36.5375 26.0625 36.4535 26.1667 36.3694 26.2917L35.8438 26.0625C35.3393 25.8125 34.8559 25.5417 34.3934 25.2292C33.973 24.9583 33.5946 24.6458 33.2583 24.2917C33.1111 24.1458 33.006 23.9792 32.9009 23.8125L33.3423 23.6042L36.1592 22.2917L37.4835 22.9375C37.4835 22.9375 37.6727 22.9583 37.7778 22.9375C37.8198 23.2917 37.9459 23.625 38.1141 23.9375L38.03 23.9792C37.7147 24.4792 37.3784 24.9792 37.021 25.4583ZM33.7628 14.8125C33.8889 14.625 34.036 14.4375 34.1832 14.2708C34.5616 13.8958 34.982 13.5625 35.4234 13.2708H35.8649C35.8649 14.3958 35.6757 15.5417 35.2973 16.6042L35.0661 16.4792L34.8348 16.3125L34.4565 16C34.2042 15.7708 33.973 15.5208 33.7628 15.2708H33.6156L33.4895 15.125L33.7628 14.8125ZM27.982 16C28.6547 16.4167 29.4324 16.6667 30.2312 16.6875C30.967 16.6458 31.7027 16.4375 32.3333 16.0417C32.9009 16.8333 33.6156 17.5 34.4354 18H34.5616C34.2883 18.2708 33.973 18.4792 33.6366 18.6458C33.2162 18.9167 32.6697 18.9167 32.2492 18.6458C31.9339 18.3125 31.5976 18.0208 31.2402 17.7292C30.5045 17.2917 29.6637 17.0417 28.8018 17.0417C28.3393 16.6875 27.7928 16.4583 27.2042 16.375L27.982 16ZM30.3153 19.0625C30.5045 19.1667 30.6517 19.2917 30.7988 19.4375C29.8739 19.6667 28.97 19.9792 28.1081 20.375C27.3934 20.875 26.7417 21.5 26.2372 22.2083L26.1321 22.0833L25.964 21.8125C25.7958 21.5833 25.6486 21.3542 25.5435 21.1042V20.9792C25.4384 20.8333 25.4384 20.6667 25.4384 20.5417V20.4167C25.4384 20.2708 25.4384 20.1042 25.4384 19.9583C26.6997 18.6458 28.6757 18.2708 30.3153 19.0625ZM21.5706 12.375C23.2733 12.375 24.8919 13.0833 26.027 14.3333C26.1952 14.5208 26.3423 14.7292 26.4895 14.9375H26.5946C26.1111 15.1458 25.6276 15.3333 25.1231 15.4583C23.5045 15.7083 21.8649 15.3333 20.5195 14.4375C19.8048 14.0208 19.1321 13.5625 18.4174 13.1875C19.3634 12.625 20.4565 12.3542 21.5706 12.375ZM17.0511 14.3542L17.3664 14.5H17.3874L16.1051 15.8125C16.3363 15.2708 16.6517 14.7917 17.0511 14.3542ZM15.7688 18.6042V18.4583L16.0631 18.1667C17.6396 20.375 18.5435 22.9792 18.7117 25.6875C17.1141 23.625 16.1051 21.1875 15.7688 18.6042ZM18.8378 19.4583V19.6458C18.3544 18.7083 17.7658 17.8333 17.0721 17.0208L18.7327 15.3333C19.4054 15.7708 20.0991 16.1458 20.8348 16.4583C20.3934 16.6667 19.994 16.9792 19.6787 17.375C19.3213 18.0417 19.048 18.7292 18.8378 19.4583ZM20.6246 19.7708L20.982 18.8333C21.0661 18.5625 21.1712 18.3125 21.2973 18.0833C21.3183 18.0208 21.3604 17.9583 21.4024 17.9167L21.6547 17.6667H21.7808C21.8859 17.6042 22.012 17.5417 22.1381 17.4792H22.2853L22.6216 17.3542L23.1892 17.2292C23.4204 17.4167 23.6727 17.5833 23.9459 17.7083C24.5135 17.8125 25.1021 17.875 25.6907 17.8542C24.9339 18.25 24.2613 18.7917 23.7147 19.4375C23.2523 20.1667 22.8739 20.9375 22.6216 21.75C22.012 22.4375 21.1712 22.8958 20.2673 23.0625C20.1622 22.5625 20.036 22.0833 19.9099 21.6042C20.1411 21 20.3724 20.375 20.6246 19.7708ZM20.2042 25.0625C21.2342 24.7708 22.2012 24.2708 23.0631 23.625C23.5676 23.1458 23.9459 22.5625 24.1562 21.8958C24.1772 22 24.2192 22.1042 24.2613 22.1875C24.4084 22.4583 24.5766 22.7083 24.7447 22.9583C24.9339 23.2917 25.2072 23.5833 25.5225 23.8125H25.6486C25.3333 24.3958 25.1231 25.0417 24.997 25.6875V25.9583C24.8709 25.8542 24.7447 25.75 24.5976 25.6875C23.988 25.4792 23.3363 25.4792 22.7267 25.6875C22.1592 25.8542 21.6757 26.1875 21.0871 26.4792C20.8559 26.5833 20.6036 26.6458 20.3514 26.7083C20.3303 26.1667 20.2042 25.6042 20.2042 25.0625ZM20.5616 28.2083C20.8138 28.1667 21.045 28.125 21.2763 28.0417C21.8018 27.8333 22.3273 27.6042 22.8318 27.3333C23.1471 27.1458 23.5255 27.0625 23.8829 27.0833C24.009 27.125 24.1351 27.1875 24.2402 27.2708L24.7237 27.7708C24.7237 27.7708 24.8288 27.9167 24.8919 27.9583C24.7027 28.6667 24.5135 29.3542 24.2823 30.0417C24.2402 30.2083 24.1772 30.375 24.1141 30.5417V30.6875L23.988 30.9583C23.9039 31.1042 23.8198 31.25 23.7147 31.3958C23.7147 31.4375 23.6727 31.4792 23.6517 31.5208L21.2763 29.4375C21.0661 29.0208 20.8138 28.6042 20.5616 28.2083ZM23.021 35.375C22.8739 34.4375 22.6847 33.5208 22.4324 32.6042L24.9339 34.75C24.3243 35.0208 23.6727 35.2292 23.021 35.375ZM34.8769 39.9583V54.5417L25.3754 54.3958V39.8125C25.1231 36.9167 27.2252 34.3542 30.1261 34.0208H30.1682C33.1111 34.375 35.2132 37.0208 34.8769 39.9583ZM37.3784 35.0833C37.2102 34.9375 37.042 34.7708 36.8739 34.6458C35.991 33.9792 35.045 33.4167 34.015 33C34.3934 32.25 34.7087 31.4792 35.003 30.7083C35.8649 31.1042 36.7688 31.3958 37.6937 31.5833C37.7778 31.8333 37.8829 32.0833 37.988 32.3333C37.7147 33.2292 37.5045 34.1458 37.3784 35.0833ZM40.0901 27.7708C39.6276 28.4167 39.2282 29.125 38.9129 29.8542C38.7658 28.8542 38.4084 27.9167 37.8198 27.0833C38.2823 26.4792 38.7447 25.8542 39.1652 25.2083C39.5225 25.5208 39.9009 25.7917 40.3003 26.0417C40.5315 26.2083 40.7838 26.3542 41.036 26.4792C40.7417 26.8958 40.4264 27.3333 40.0901 27.7708ZM41.9399 25.1875C41.4985 24.9167 41.0571 24.6667 40.6156 24.3542C39.6276 23.6875 38.997 22.8125 39.6276 21.6042L39.7538 21.3958C39.9009 21.0625 40.1532 20.7708 40.4474 20.5625C40.5946 20.4375 40.7417 20.3333 40.9099 20.2292C41.6456 21.1458 42.4024 22.2292 43.1381 23.2292C42.8018 23.8542 42.4024 24.5 41.9399 25.1875ZM43.8949 21.625C43.3273 20.8542 42.7808 20.0625 42.2132 19.2708C42.4865 19.2083 42.7808 19.1458 43.0541 19.125C43.5586 19.0625 44.0631 19.0625 44.5676 19.125C44.4625 19.9792 44.2312 20.8333 43.8949 21.625Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_188">
-<rect width="42" height="50" fill="white" transform="translate(9 6)"/>
+<rect width="42" height="50"  transform="translate(9 6)"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-brain.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-brain.svg
index 426e63688..6ee01f97d 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-brain.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-brain.svg
@@ -1,10 +1,10 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_216)">
-<path d="M34.7733 7.40267C18.1759 4.26667 4.2666 12.3947 4.2666 23.6587C4.2666 33.984 9.53594 36.4587 14.9333 36.4587C14.9333 29.5253 26.8586 28.544 32.4053 30.6347C27.2426 29.9733 16.9173 30.1653 16.9173 37.6107C16.9173 38.08 16.9173 42.88 23.5519 43.584C26.2463 43.902 28.9737 43.8013 31.6373 43.2853C31.5649 43.9994 31.7363 44.717 32.1237 45.3213C32.511 45.9256 33.0915 46.381 33.7706 46.6133C34.3272 46.8009 34.8979 46.9435 35.4773 47.04C37.2727 49.7425 39.4256 52.1895 41.8773 54.3147C42.453 54.2798 43.0007 54.0547 43.4346 53.6747C43.793 53.3822 44.0227 52.961 44.0746 52.5013C42.7674 51.1176 41.9118 49.3692 41.6213 47.488C42.6239 47.488 43.2853 47.488 43.2853 47.488C43.2853 47.488 52.5439 46.9333 51.8186 42.176C51.8186 42.048 51.8186 41.92 51.7119 41.792C52.9577 42.0466 54.2421 42.0466 55.4879 41.792C58.3466 40.9387 59.5413 37.7813 59.7546 33.6427C60.0746 26.496 51.3493 10.5387 34.7733 7.40267Z" fill="white"/>
+<path d="M34.7733 7.40267C18.1759 4.26667 4.2666 12.3947 4.2666 23.6587C4.2666 33.984 9.53594 36.4587 14.9333 36.4587C14.9333 29.5253 26.8586 28.544 32.4053 30.6347C27.2426 29.9733 16.9173 30.1653 16.9173 37.6107C16.9173 38.08 16.9173 42.88 23.5519 43.584C26.2463 43.902 28.9737 43.8013 31.6373 43.2853C31.5649 43.9994 31.7363 44.717 32.1237 45.3213C32.511 45.9256 33.0915 46.381 33.7706 46.6133C34.3272 46.8009 34.8979 46.9435 35.4773 47.04C37.2727 49.7425 39.4256 52.1895 41.8773 54.3147C42.453 54.2798 43.0007 54.0547 43.4346 53.6747C43.793 53.3822 44.0227 52.961 44.0746 52.5013C42.7674 51.1176 41.9118 49.3692 41.6213 47.488C42.6239 47.488 43.2853 47.488 43.2853 47.488C43.2853 47.488 52.5439 46.9333 51.8186 42.176C51.8186 42.048 51.8186 41.92 51.7119 41.792C52.9577 42.0466 54.2421 42.0466 55.4879 41.792C58.3466 40.9387 59.5413 37.7813 59.7546 33.6427C60.0746 26.496 51.3493 10.5387 34.7733 7.40267Z"/>
 </g>
 <defs>
 <clipPath id="clip0_1795_216">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-breast.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-breast.svg
index 40178ccd2..b35c6ded6 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-breast.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-breast.svg
@@ -1,15 +1,15 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_220)">
 <g clip-path="url(#clip1_1795_220)">
-<path d="M61.586 32.6954C59.5313 32.1674 57.808 30.7815 56.9022 28.8676C55.8417 26.1838 47.181 16.8785 39.2272 12.1488C32.5771 8.29903 28.1142 1.58949 27.1199 -6H21L21.707 45.4985C21.7512 48.0943 30.3456 51.2621 30.3456 51.2621C32.5992 51.9441 34.8969 52.472 37.2167 52.846C46.4298 53.726 52.1962 50.9541 56.6149 42.4187C57.1231 41.0108 58.7138 38.811 60.0836 38.547C61.0337 38.459 61.8953 37.953 62.4477 37.1611C63.4419 35.6872 63.0663 33.7073 61.586 32.6954ZM41.6575 20.2222C41.8343 20.0022 42.0773 19.9142 42.3645 19.9142C42.3866 19.9142 42.4087 19.9142 42.4529 19.9142C43.4029 19.9582 44.7065 20.9702 45.6786 22.4221C46.1205 23.082 46.7833 23.61 47.424 24.116C48.0868 24.6439 48.7275 25.1499 48.8822 25.6559C49.081 26.4478 48.8822 27.3277 48.3961 27.9657C47.7112 28.7576 45.9658 27.9877 43.3588 25.7658C42.5855 24.8859 42.011 23.83 41.7238 22.6861V22.6201C41.282 21.8501 41.282 20.9482 41.6575 20.2222ZM29.3514 25.8538C29.3956 25.6339 29.5723 25.4579 29.8595 25.3039C30.2572 25.1059 30.8538 24.9739 31.6049 24.9739C32.5992 24.9739 33.8364 25.1939 35.1399 25.7219C36.0679 26.0958 37.1725 26.2498 38.2109 26.3818C39.2714 26.5358 40.2877 26.6678 40.8401 27.0198C41.6134 27.5257 42.0773 28.4277 42.0331 29.3296C41.9227 29.9456 40.9064 30.8255 35.0957 29.9456C33.6817 29.5936 32.3119 28.9116 31.141 27.9657L30.8759 27.8117C29.727 27.1518 29.1305 26.7778 29.3514 25.8318V25.8538ZM42.2762 32.3434C42.8506 32.3434 43.5134 32.4754 44.1983 32.7174C44.9274 32.9814 45.6786 32.9154 46.3414 32.8494C46.96 32.7834 47.5124 32.7394 47.8217 32.9594C48.3961 33.4653 48.7275 34.1913 48.7496 34.9612C48.7496 35.2252 48.6612 35.4232 48.4845 35.5992C47.91 36.1711 46.4298 36.4131 44.1762 36.3251C43.1599 36.1491 42.2099 35.6872 41.4366 34.9832L41.3703 34.9392C40.7959 34.6752 40.4866 34.0373 40.6191 33.3993C40.6191 33.0694 40.7738 32.8274 41.0389 32.6514C41.3482 32.4534 41.768 32.3434 42.2983 32.3434H42.2762ZM28.8874 37.755C28.8874 36.5011 30.5224 35.8192 32.0247 35.8192H32.0468C32.4445 35.8192 32.8643 35.8632 33.262 35.9512H33.7038C34.9411 36.2371 35.7144 36.4131 37.5481 36.8971C38.7191 37.2931 39.6691 38.195 40.0889 39.3609C40.2215 39.8669 40.0889 40.4169 39.7354 40.8128C38.8075 41.7148 37.5481 42.1987 36.2446 42.1107C35.7144 42.1107 35.2062 42.0448 34.6981 41.9348C33.5713 41.6488 32.4887 41.2748 31.4282 40.7908L30.9642 40.5928C29.6386 40.3289 28.7328 39.0969 28.8874 37.755ZM39.0947 45.4325C39.0063 45.7405 38.0784 46.5764 36.4876 47.1484C35.3388 47.5664 33.1515 48.0723 31.384 46.8624C30.5003 46.2465 29.5723 45.5205 29.4619 44.6406C29.4177 44.0686 29.6165 43.5846 30.0363 43.2327C30.5224 42.8147 31.2735 42.6167 32.1352 42.6167C32.5992 42.6167 33.1073 42.6827 33.6155 42.8147C34.4329 43.0347 35.3388 42.9027 36.1341 42.7707C36.9074 42.6607 37.6365 42.5507 38.0342 42.7707C38.8738 43.3867 39.2714 44.4426 39.0505 45.4545L39.0947 45.4325ZM50.1857 47.1264C49.6775 47.8084 48.9043 48.0503 48.2415 47.7864C47.0484 47.3244 45.767 47.8084 44.7507 48.2263C43.646 48.6663 43.182 48.7983 42.9611 48.3583C42.5413 47.5444 42.4308 46.8844 42.5855 46.3785C42.8285 45.6965 43.5576 45.3445 44.2204 45.0365C44.4193 44.9486 44.596 44.8606 44.7507 44.7726C46.6728 43.6726 47.7554 43.2547 48.4845 43.2547C49.2136 43.2547 49.6113 43.7166 50.1194 44.3766C50.9148 45.3885 50.6497 46.4884 50.1857 47.1264ZM60.2383 35.4892V35.6432V35.9512H60.2162V36.5891C59.9953 36.5891 59.7964 36.5891 59.5976 36.5891C58.4487 36.6551 57.2998 36.8311 56.151 37.0511C55.7533 37.4251 55.3777 38.481 55.0242 39.5809C54.3172 41.7368 53.4335 44.3986 51.1136 45.4325C51.0694 45.1025 50.9369 44.7506 50.738 44.3986C52.5718 43.5626 53.323 41.2748 53.9858 39.2509C54.1846 38.679 54.3614 38.151 54.5602 37.689C54.2951 37.909 54.03 38.217 53.7428 38.525C52.7044 39.6469 51.4229 41.0328 48.838 41.0328H48.7938C45.5018 41.5608 42.3204 42.9907 39.647 45.0805C39.6691 44.6626 39.647 44.2446 39.4924 43.8486C42.2099 41.8468 45.3693 40.4609 48.7054 39.9329C50.8927 39.9329 51.909 38.833 52.9032 37.755C53.5218 37.0951 54.0963 36.4791 54.8916 36.2151C54.7149 36.2151 54.516 36.2151 54.3614 36.2371C54.1625 36.3911 53.9637 36.5671 53.7428 36.7651C52.4392 37.887 50.8264 39.2729 48.2635 39.2729H48.2194C47.3135 39.4709 46.474 39.6689 45.7007 39.8449C43.9774 40.2409 42.6739 40.5488 41.1715 40.5488C40.9506 40.5488 40.7296 40.5488 40.5087 40.5048C40.6412 40.1749 40.6854 39.8009 40.6412 39.4049C42.2541 39.4929 43.5576 39.2069 45.4356 38.767C46.2088 38.591 47.0705 38.393 48.0868 38.173C50.031 38.173 51.3125 37.3151 52.3951 36.4131C51.5113 36.4131 50.495 36.1271 49.1694 35.2252C49.1694 35.1152 49.2357 35.0272 49.2357 34.9172C49.2357 34.6312 49.1694 34.3453 49.081 34.0813L49.1915 33.9273C51.2683 35.5332 52.2846 35.3792 53.566 35.2032C53.6544 35.2032 53.7649 35.1812 53.8753 35.1592C53.9858 35.0712 54.1184 34.9832 54.2288 34.8952C53.323 34.4773 52.5055 33.9053 51.9753 33.0694C51.0694 31.6834 50.6938 31.5075 46.8937 30.9355C45.3251 30.8035 43.8006 30.2975 42.4087 29.4836C42.4087 29.4176 42.475 29.3736 42.4971 29.3076C42.4971 28.9116 42.4308 28.5157 42.2983 28.1417C43.7123 29.0876 45.3472 29.6816 47.0484 29.8356C50.8043 30.4075 51.7102 30.6055 52.9253 32.4534C53.5439 33.3993 54.6486 33.9713 55.8196 34.3013C55.9079 34.3013 56.0184 34.3013 56.1068 34.2793C56.0626 34.2793 56.0405 34.2573 55.9963 34.2353C55.0463 33.6633 54.8695 33.2453 54.6928 32.5854C54.5381 32.0794 54.3393 31.3755 53.1241 30.0556C51.7985 29.2196 50.3403 28.5597 48.838 28.0757C49.0589 27.7677 49.2136 27.4377 49.3019 27.0858C50.8706 27.5917 52.373 28.2737 53.7649 29.1536L53.8753 29.2416C55.3114 30.8035 55.5544 31.6834 55.7312 32.2774C55.8638 32.7394 55.9079 32.8934 56.5266 33.2673C57.6092 33.8173 58.8685 34.1253 60.1278 34.1253C60.1278 34.1253 60.172 34.1253 60.1941 34.1253L60.1278 34.6752V35.2252V35.4012L60.2383 35.4892Z" fill="white"/>
+<path d="M61.586 32.6954C59.5313 32.1674 57.808 30.7815 56.9022 28.8676C55.8417 26.1838 47.181 16.8785 39.2272 12.1488C32.5771 8.29903 28.1142 1.58949 27.1199 -6H21L21.707 45.4985C21.7512 48.0943 30.3456 51.2621 30.3456 51.2621C32.5992 51.9441 34.8969 52.472 37.2167 52.846C46.4298 53.726 52.1962 50.9541 56.6149 42.4187C57.1231 41.0108 58.7138 38.811 60.0836 38.547C61.0337 38.459 61.8953 37.953 62.4477 37.1611C63.4419 35.6872 63.0663 33.7073 61.586 32.6954ZM41.6575 20.2222C41.8343 20.0022 42.0773 19.9142 42.3645 19.9142C42.3866 19.9142 42.4087 19.9142 42.4529 19.9142C43.4029 19.9582 44.7065 20.9702 45.6786 22.4221C46.1205 23.082 46.7833 23.61 47.424 24.116C48.0868 24.6439 48.7275 25.1499 48.8822 25.6559C49.081 26.4478 48.8822 27.3277 48.3961 27.9657C47.7112 28.7576 45.9658 27.9877 43.3588 25.7658C42.5855 24.8859 42.011 23.83 41.7238 22.6861V22.6201C41.282 21.8501 41.282 20.9482 41.6575 20.2222ZM29.3514 25.8538C29.3956 25.6339 29.5723 25.4579 29.8595 25.3039C30.2572 25.1059 30.8538 24.9739 31.6049 24.9739C32.5992 24.9739 33.8364 25.1939 35.1399 25.7219C36.0679 26.0958 37.1725 26.2498 38.2109 26.3818C39.2714 26.5358 40.2877 26.6678 40.8401 27.0198C41.6134 27.5257 42.0773 28.4277 42.0331 29.3296C41.9227 29.9456 40.9064 30.8255 35.0957 29.9456C33.6817 29.5936 32.3119 28.9116 31.141 27.9657L30.8759 27.8117C29.727 27.1518 29.1305 26.7778 29.3514 25.8318V25.8538ZM42.2762 32.3434C42.8506 32.3434 43.5134 32.4754 44.1983 32.7174C44.9274 32.9814 45.6786 32.9154 46.3414 32.8494C46.96 32.7834 47.5124 32.7394 47.8217 32.9594C48.3961 33.4653 48.7275 34.1913 48.7496 34.9612C48.7496 35.2252 48.6612 35.4232 48.4845 35.5992C47.91 36.1711 46.4298 36.4131 44.1762 36.3251C43.1599 36.1491 42.2099 35.6872 41.4366 34.9832L41.3703 34.9392C40.7959 34.6752 40.4866 34.0373 40.6191 33.3993C40.6191 33.0694 40.7738 32.8274 41.0389 32.6514C41.3482 32.4534 41.768 32.3434 42.2983 32.3434H42.2762ZM28.8874 37.755C28.8874 36.5011 30.5224 35.8192 32.0247 35.8192H32.0468C32.4445 35.8192 32.8643 35.8632 33.262 35.9512H33.7038C34.9411 36.2371 35.7144 36.4131 37.5481 36.8971C38.7191 37.2931 39.6691 38.195 40.0889 39.3609C40.2215 39.8669 40.0889 40.4169 39.7354 40.8128C38.8075 41.7148 37.5481 42.1987 36.2446 42.1107C35.7144 42.1107 35.2062 42.0448 34.6981 41.9348C33.5713 41.6488 32.4887 41.2748 31.4282 40.7908L30.9642 40.5928C29.6386 40.3289 28.7328 39.0969 28.8874 37.755ZM39.0947 45.4325C39.0063 45.7405 38.0784 46.5764 36.4876 47.1484C35.3388 47.5664 33.1515 48.0723 31.384 46.8624C30.5003 46.2465 29.5723 45.5205 29.4619 44.6406C29.4177 44.0686 29.6165 43.5846 30.0363 43.2327C30.5224 42.8147 31.2735 42.6167 32.1352 42.6167C32.5992 42.6167 33.1073 42.6827 33.6155 42.8147C34.4329 43.0347 35.3388 42.9027 36.1341 42.7707C36.9074 42.6607 37.6365 42.5507 38.0342 42.7707C38.8738 43.3867 39.2714 44.4426 39.0505 45.4545L39.0947 45.4325ZM50.1857 47.1264C49.6775 47.8084 48.9043 48.0503 48.2415 47.7864C47.0484 47.3244 45.767 47.8084 44.7507 48.2263C43.646 48.6663 43.182 48.7983 42.9611 48.3583C42.5413 47.5444 42.4308 46.8844 42.5855 46.3785C42.8285 45.6965 43.5576 45.3445 44.2204 45.0365C44.4193 44.9486 44.596 44.8606 44.7507 44.7726C46.6728 43.6726 47.7554 43.2547 48.4845 43.2547C49.2136 43.2547 49.6113 43.7166 50.1194 44.3766C50.9148 45.3885 50.6497 46.4884 50.1857 47.1264ZM60.2383 35.4892V35.6432V35.9512H60.2162V36.5891C59.9953 36.5891 59.7964 36.5891 59.5976 36.5891C58.4487 36.6551 57.2998 36.8311 56.151 37.0511C55.7533 37.4251 55.3777 38.481 55.0242 39.5809C54.3172 41.7368 53.4335 44.3986 51.1136 45.4325C51.0694 45.1025 50.9369 44.7506 50.738 44.3986C52.5718 43.5626 53.323 41.2748 53.9858 39.2509C54.1846 38.679 54.3614 38.151 54.5602 37.689C54.2951 37.909 54.03 38.217 53.7428 38.525C52.7044 39.6469 51.4229 41.0328 48.838 41.0328H48.7938C45.5018 41.5608 42.3204 42.9907 39.647 45.0805C39.6691 44.6626 39.647 44.2446 39.4924 43.8486C42.2099 41.8468 45.3693 40.4609 48.7054 39.9329C50.8927 39.9329 51.909 38.833 52.9032 37.755C53.5218 37.0951 54.0963 36.4791 54.8916 36.2151C54.7149 36.2151 54.516 36.2151 54.3614 36.2371C54.1625 36.3911 53.9637 36.5671 53.7428 36.7651C52.4392 37.887 50.8264 39.2729 48.2635 39.2729H48.2194C47.3135 39.4709 46.474 39.6689 45.7007 39.8449C43.9774 40.2409 42.6739 40.5488 41.1715 40.5488C40.9506 40.5488 40.7296 40.5488 40.5087 40.5048C40.6412 40.1749 40.6854 39.8009 40.6412 39.4049C42.2541 39.4929 43.5576 39.2069 45.4356 38.767C46.2088 38.591 47.0705 38.393 48.0868 38.173C50.031 38.173 51.3125 37.3151 52.3951 36.4131C51.5113 36.4131 50.495 36.1271 49.1694 35.2252C49.1694 35.1152 49.2357 35.0272 49.2357 34.9172C49.2357 34.6312 49.1694 34.3453 49.081 34.0813L49.1915 33.9273C51.2683 35.5332 52.2846 35.3792 53.566 35.2032C53.6544 35.2032 53.7649 35.1812 53.8753 35.1592C53.9858 35.0712 54.1184 34.9832 54.2288 34.8952C53.323 34.4773 52.5055 33.9053 51.9753 33.0694C51.0694 31.6834 50.6938 31.5075 46.8937 30.9355C45.3251 30.8035 43.8006 30.2975 42.4087 29.4836C42.4087 29.4176 42.475 29.3736 42.4971 29.3076C42.4971 28.9116 42.4308 28.5157 42.2983 28.1417C43.7123 29.0876 45.3472 29.6816 47.0484 29.8356C50.8043 30.4075 51.7102 30.6055 52.9253 32.4534C53.5439 33.3993 54.6486 33.9713 55.8196 34.3013C55.9079 34.3013 56.0184 34.3013 56.1068 34.2793C56.0626 34.2793 56.0405 34.2573 55.9963 34.2353C55.0463 33.6633 54.8695 33.2453 54.6928 32.5854C54.5381 32.0794 54.3393 31.3755 53.1241 30.0556C51.7985 29.2196 50.3403 28.5597 48.838 28.0757C49.0589 27.7677 49.2136 27.4377 49.3019 27.0858C50.8706 27.5917 52.373 28.2737 53.7649 29.1536L53.8753 29.2416C55.3114 30.8035 55.5544 31.6834 55.7312 32.2774C55.8638 32.7394 55.9079 32.8934 56.5266 33.2673C57.6092 33.8173 58.8685 34.1253 60.1278 34.1253C60.1278 34.1253 60.172 34.1253 60.1941 34.1253L60.1278 34.6752V35.2252V35.4012L60.2383 35.4892Z" />
 </g>
 </g>
 <defs>
 <clipPath id="clip0_1795_220">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 <clipPath id="clip1_1795_220">
-<rect width="42" height="59" fill="white" transform="translate(21 -6)"/>
+<rect width="42" height="59"  transform="translate(21 -6)"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-extrapulmonary-bronchus.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-extrapulmonary-bronchus.svg
index 1ebb8765a..d90961d85 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-extrapulmonary-bronchus.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-extrapulmonary-bronchus.svg
@@ -1,26 +1,26 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_464)">
-<path d="M13.3956 34.9253L13.2803 35.7585C13.0957 37.1934 13.7186 38.7441 14.9181 39.8319L15.1027 40.017C16.2791 40.9659 17.8016 41.3594 19.1396 41.0354L19.97 40.8271C19.97 40.8271 21.654 39.4616 22.5536 38.5358C22.2538 38.5821 21.9308 38.6284 21.6309 38.6284C19.9239 38.6284 18.0784 37.9572 16.579 36.6148C15.4948 35.6428 14.7336 34.4393 14.2953 33.1664C13.9493 33.7681 13.3956 34.9022 13.3956 34.9022V34.9253Z" fill="white"/>
-<path d="M14.5721 40.3642C13.165 39.0913 12.5421 37.3323 12.7497 35.7817C11.9885 35.9668 11.2965 36.3371 10.7659 36.9389C9.15112 38.7441 9.54328 41.7528 11.6425 43.6507C13.7417 45.5485 16.7636 45.6179 18.3783 43.8127C18.9089 43.2109 19.2088 42.4703 19.3241 41.7066C17.8016 42.0769 15.9793 41.6603 14.5721 40.3873V40.3642Z" fill="white"/>
-<path d="M9.19724 47.4231C8.04383 46.1039 7.72088 44.345 8.18224 42.8406C7.421 42.9795 6.65975 43.2804 6.05998 43.8358C4.19147 45.479 4.07613 48.4415 5.80623 50.4087C7.53634 52.3991 10.466 52.6537 12.3345 51.0105C12.9573 50.455 13.3726 49.7607 13.6032 49.0201C12.0577 49.2978 10.3506 48.7424 9.19724 47.4231Z" fill="white"/>
-<path d="M40.2007 32.7729C38.3091 34.393 36.0254 35.0642 34.203 34.7402C34.203 35.6659 34.4798 36.4991 35.0335 37.1703C36.7405 39.1838 40.4314 38.8367 43.2918 36.4066C46.1292 33.9764 47.0519 30.3659 45.3449 28.3524C44.7682 27.6812 43.9839 27.3109 43.0842 27.1489C43.1073 29.0004 42.0923 31.1297 40.2007 32.7729Z" fill="white"/>
-<path d="M43.7071 37.5406C41.8155 39.1607 39.7624 39.855 37.917 39.5079C37.9401 40.4336 37.9631 41.2668 38.5629 41.9611C40.3161 44.021 44.0531 43.7201 46.8905 41.29C49.7278 38.8598 50.6275 35.2031 48.8743 33.1432C48.2976 32.4489 47.4902 32.0555 46.5675 31.8934C46.6136 33.7681 45.6217 35.9205 43.7071 37.5638V37.5406Z" fill="white"/>
-<path d="M48.5513 43.5118C46.5905 45.5485 44.3759 46.7983 42.692 47.0297C42.6228 47.8629 42.7843 48.5804 43.2456 49.0432C44.6758 50.4319 48.2052 49.0664 51.1349 46.0114C54.0645 42.9563 55.2641 39.369 53.8338 37.9804C53.3494 37.5175 52.6343 37.3786 51.8039 37.4943C51.6655 39.207 50.489 41.4751 48.5513 43.5118Z" fill="white"/>
-<path d="M57.4325 43.5118C56.902 44.8079 55.9792 45.7336 55.0334 46.0576C55.2411 46.4974 55.564 46.8445 55.9792 47.0297C57.248 47.562 59.0242 46.1502 59.8085 44.2293C60.5928 42.3083 60.1315 40.5725 58.8627 40.0402C58.4475 39.855 57.9862 39.8782 57.5248 40.0402C57.9631 40.9196 57.9631 42.2389 57.4325 43.5349V43.5118Z" fill="white"/>
-<path d="M51.4348 52.0057C49.4971 53.0009 47.5363 53.3249 46.1984 52.9546C45.9677 53.6026 45.9216 54.2044 46.1984 54.7135C46.9827 56.2411 49.9816 56.2642 52.8881 54.7598C55.7947 53.2555 57.5017 50.8022 56.7174 49.2515C56.4637 48.7424 55.9331 48.4183 55.2641 48.2332C54.7797 49.5293 53.3956 50.9642 51.4579 51.9594V52.0057H51.4348Z" fill="white"/>
-<path d="M25.2065 18.5393C26.3368 19.7659 27.744 21.386 29.2434 22.0572C30.8351 22.7515 32.5882 22.1266 32.5882 22.1266C34.2953 21.386 35.91 19.6965 37.1788 18.3773C37.6401 17.8913 38.0323 17.4747 38.4245 17.1275L38.2399 8.67991C38.1938 6.5275 36.3253 4.83798 34.1799 5.02314C32.4729 5.162 28.3899 5.06943 28.2053 5.06943H27.9746C25.8062 4.90742 23.9608 6.66637 23.9839 8.86506L24.0992 17.4052C24.4452 17.7293 24.7912 18.1227 25.2065 18.5393Z" fill="white"/>
-<path d="M25.5063 34.7865C23.9608 34.9253 21.9308 34.2773 20.9158 33.6524C20.639 33.4904 19.9469 32.8192 19.9469 32.8192C18.3322 31.3611 17.3864 29.4402 17.3172 27.5192C16.7635 27.7507 16.3022 28.0747 15.9331 28.4681C15.218 29.255 14.872 30.3196 14.9412 31.5C15.0334 33.0969 15.8639 34.6939 17.2018 35.8742C19.6009 38.0266 22.9689 38.1886 24.699 36.2677C25.068 35.8742 25.3218 35.3651 25.4833 34.7865H25.5063Z" fill="white"/>
-<path d="M9.10498 53.024C8.98964 53.024 8.8743 53.024 8.75896 53.024C7.32874 52.9314 6.01387 52.2603 5.04501 51.1493C4.09922 50.0616 3.59172 48.6266 3.68399 47.2148C3.73013 46.6131 3.86854 46.0576 4.09922 45.5253C3.7532 45.7105 3.40718 45.8956 3.08422 45.9882C2.76127 46.1039 2.50752 46.3354 2.39218 46.6362C2.34605 46.752 1.16958 49.6681 3.26877 52.5611C5.32182 55.3847 8.8051 55.4079 8.94351 55.4079C9.33567 55.4079 9.70475 55.1996 9.91237 54.8755C10.3507 54.1812 10.9504 53.3017 11.5963 52.3528C10.8582 52.7926 10.0046 53.024 9.10498 53.024Z" fill="white"/>
-<path d="M9.33559 41.6371L9.05877 42.5397C8.64354 43.9052 8.98956 45.4559 9.95842 46.5668C10.9273 47.7009 12.4267 48.2332 13.8339 47.9786L14.7796 47.8166C14.7796 47.8166 15.933 46.4742 16.579 45.6179C16.2099 45.7336 15.8408 45.8031 15.4486 45.8262C15.3563 45.8262 15.2641 45.8262 15.1718 45.8262C13.7416 45.8262 12.2652 45.2476 11.1118 44.2061C10.0738 43.2572 9.35865 41.6371 9.35865 41.6371H9.33559Z" fill="white"/>
-<path d="M33.6263 33.7913L34.2953 33.907C36.0254 34.2079 38.1246 33.5135 39.8085 32.0786C41.5156 30.5974 42.5075 28.6533 42.4844 26.8943V26.2C42.4844 26.2 41.5848 20.8306 41.5848 18.4467C41.5848 17.9838 41.308 17.5673 40.8927 17.3821C40.4544 17.1969 39.97 17.2895 39.647 17.6135L36.0023 21.1546C34.4106 22.6821 33.0035 23.5384 32.2883 23.6773C32.1038 23.7236 30.3968 23.9319 29.8893 23.7467C28.0208 23.0755 26.9366 22.3118 25.7832 20.7148L23.1765 17.1275C22.9227 16.7804 22.4844 16.5952 22.0692 16.6646C21.6309 16.7341 21.2849 17.0349 21.1465 17.4515C20.4314 19.6734 18.5859 25.8297 18.5859 25.8297L18.4936 26.6397C18.3091 28.3061 19.0011 30.0882 20.3391 31.4537L20.7082 31.7777C22.2768 33.1895 24.3299 33.7913 26.083 33.3747L26.8904 33.1895C26.8904 33.1895 29.3587 33.259 30.489 33.2358C30.5121 33.2358 30.5352 33.2358 30.5582 33.2358C31.504 33.2358 33.6263 33.8144 33.6263 33.8144V33.7913Z" fill="white"/>
-<path d="M41.9077 46.2891L42.369 46.2197C44.0069 45.9882 46.1291 44.7153 47.8823 42.8638C49.6585 40.9891 50.835 38.8367 50.9734 37.1935L51.0196 36.7306C51.0196 36.7306 50.7889 36.4297 50.5813 36.2908C50.5813 36.7769 50.5351 37.2629 50.4198 37.7952C50.0276 39.4616 48.9896 41.0585 47.5132 42.3083C46.0599 43.5581 44.3068 44.3218 42.6228 44.4607C42.4382 44.4607 42.2537 44.4607 42.0922 44.4607C41.6309 44.4607 41.1926 44.3913 40.7773 44.2987C41.1695 44.9467 41.5386 45.5948 41.9077 46.2659V46.2891Z" fill="white"/>
-<path d="M61.8154 42.748C61.654 42.2851 61.4002 41.938 61.1003 41.6371C61.3541 42.5397 61.2849 43.6275 60.8235 44.7616C60.2929 46.0345 59.3933 47.076 58.4014 47.6314C58.8166 47.7472 59.301 47.8166 59.8316 47.6314C60.5006 47.4 61.0311 46.8677 61.4233 46.0576C62.0231 44.831 62.1615 43.7201 61.8385 42.7712L61.8154 42.748Z" fill="white"/>
-<path d="M57.3403 51.6354C57.3403 51.6354 57.248 51.4734 57.1788 51.3808C56.7175 52.8851 55.218 54.5284 53.0266 55.6393C51.5502 56.403 50.0046 56.8196 48.6667 56.8196H48.6206C48.2053 56.8196 47.8132 56.7502 47.4672 56.6808C47.5594 56.8891 47.6748 57.0974 47.744 57.3057C47.9285 57.7223 48.3207 58 48.759 58C48.759 58 48.8513 58 48.9897 58C49.774 58 52.496 57.9074 54.3414 56.8428C56.5329 55.5699 57.5479 52.9314 57.594 52.8157C57.7555 52.3991 57.6402 51.9131 57.3403 51.6122V51.6354Z" fill="white"/>
-<path d="M45.1141 51.7974L45.6216 51.9362C46.7981 52.2603 48.5743 51.9362 50.2814 51.1031V51.0568L50.4659 50.9642C52.196 50.0847 53.534 48.7655 53.9953 47.5389L54.1799 47.0528C54.1799 47.0528 53.9261 46.2197 53.7877 45.8956L53.5109 45.317L54.1107 45.1087C54.9411 44.831 55.7254 43.9747 56.1637 42.8869L56.2791 42.6323C56.6251 41.614 56.6251 40.5956 56.2791 39.9013L55.9792 39.3227C55.9792 39.3227 55.7485 38.7904 55.3102 38.6284C55.1257 38.559 55.1949 38.7673 55.0103 38.6978C55.7485 40.6188 54.5028 43.8358 51.7808 46.6825C49.5893 48.9507 46.775 50.131 44.8373 50.1542C44.8143 50.1542 44.7912 50.1542 44.7681 50.1542C44.599 50.1542 44.4375 50.2004 44.2837 50.293C44.6297 50.9411 45.068 51.7742 45.068 51.7742L45.1141 51.7974Z" fill="white"/>
+<path d="M13.3956 34.9253L13.2803 35.7585C13.0957 37.1934 13.7186 38.7441 14.9181 39.8319L15.1027 40.017C16.2791 40.9659 17.8016 41.3594 19.1396 41.0354L19.97 40.8271C19.97 40.8271 21.654 39.4616 22.5536 38.5358C22.2538 38.5821 21.9308 38.6284 21.6309 38.6284C19.9239 38.6284 18.0784 37.9572 16.579 36.6148C15.4948 35.6428 14.7336 34.4393 14.2953 33.1664C13.9493 33.7681 13.3956 34.9022 13.3956 34.9022V34.9253Z" />
+<path d="M14.5721 40.3642C13.165 39.0913 12.5421 37.3323 12.7497 35.7817C11.9885 35.9668 11.2965 36.3371 10.7659 36.9389C9.15112 38.7441 9.54328 41.7528 11.6425 43.6507C13.7417 45.5485 16.7636 45.6179 18.3783 43.8127C18.9089 43.2109 19.2088 42.4703 19.3241 41.7066C17.8016 42.0769 15.9793 41.6603 14.5721 40.3873V40.3642Z" />
+<path d="M9.19724 47.4231C8.04383 46.1039 7.72088 44.345 8.18224 42.8406C7.421 42.9795 6.65975 43.2804 6.05998 43.8358C4.19147 45.479 4.07613 48.4415 5.80623 50.4087C7.53634 52.3991 10.466 52.6537 12.3345 51.0105C12.9573 50.455 13.3726 49.7607 13.6032 49.0201C12.0577 49.2978 10.3506 48.7424 9.19724 47.4231Z" />
+<path d="M40.2007 32.7729C38.3091 34.393 36.0254 35.0642 34.203 34.7402C34.203 35.6659 34.4798 36.4991 35.0335 37.1703C36.7405 39.1838 40.4314 38.8367 43.2918 36.4066C46.1292 33.9764 47.0519 30.3659 45.3449 28.3524C44.7682 27.6812 43.9839 27.3109 43.0842 27.1489C43.1073 29.0004 42.0923 31.1297 40.2007 32.7729Z" />
+<path d="M43.7071 37.5406C41.8155 39.1607 39.7624 39.855 37.917 39.5079C37.9401 40.4336 37.9631 41.2668 38.5629 41.9611C40.3161 44.021 44.0531 43.7201 46.8905 41.29C49.7278 38.8598 50.6275 35.2031 48.8743 33.1432C48.2976 32.4489 47.4902 32.0555 46.5675 31.8934C46.6136 33.7681 45.6217 35.9205 43.7071 37.5638V37.5406Z" />
+<path d="M48.5513 43.5118C46.5905 45.5485 44.3759 46.7983 42.692 47.0297C42.6228 47.8629 42.7843 48.5804 43.2456 49.0432C44.6758 50.4319 48.2052 49.0664 51.1349 46.0114C54.0645 42.9563 55.2641 39.369 53.8338 37.9804C53.3494 37.5175 52.6343 37.3786 51.8039 37.4943C51.6655 39.207 50.489 41.4751 48.5513 43.5118Z" />
+<path d="M57.4325 43.5118C56.902 44.8079 55.9792 45.7336 55.0334 46.0576C55.2411 46.4974 55.564 46.8445 55.9792 47.0297C57.248 47.562 59.0242 46.1502 59.8085 44.2293C60.5928 42.3083 60.1315 40.5725 58.8627 40.0402C58.4475 39.855 57.9862 39.8782 57.5248 40.0402C57.9631 40.9196 57.9631 42.2389 57.4325 43.5349V43.5118Z" />
+<path d="M51.4348 52.0057C49.4971 53.0009 47.5363 53.3249 46.1984 52.9546C45.9677 53.6026 45.9216 54.2044 46.1984 54.7135C46.9827 56.2411 49.9816 56.2642 52.8881 54.7598C55.7947 53.2555 57.5017 50.8022 56.7174 49.2515C56.4637 48.7424 55.9331 48.4183 55.2641 48.2332C54.7797 49.5293 53.3956 50.9642 51.4579 51.9594V52.0057H51.4348Z" />
+<path d="M25.2065 18.5393C26.3368 19.7659 27.744 21.386 29.2434 22.0572C30.8351 22.7515 32.5882 22.1266 32.5882 22.1266C34.2953 21.386 35.91 19.6965 37.1788 18.3773C37.6401 17.8913 38.0323 17.4747 38.4245 17.1275L38.2399 8.67991C38.1938 6.5275 36.3253 4.83798 34.1799 5.02314C32.4729 5.162 28.3899 5.06943 28.2053 5.06943H27.9746C25.8062 4.90742 23.9608 6.66637 23.9839 8.86506L24.0992 17.4052C24.4452 17.7293 24.7912 18.1227 25.2065 18.5393Z" />
+<path d="M25.5063 34.7865C23.9608 34.9253 21.9308 34.2773 20.9158 33.6524C20.639 33.4904 19.9469 32.8192 19.9469 32.8192C18.3322 31.3611 17.3864 29.4402 17.3172 27.5192C16.7635 27.7507 16.3022 28.0747 15.9331 28.4681C15.218 29.255 14.872 30.3196 14.9412 31.5C15.0334 33.0969 15.8639 34.6939 17.2018 35.8742C19.6009 38.0266 22.9689 38.1886 24.699 36.2677C25.068 35.8742 25.3218 35.3651 25.4833 34.7865H25.5063Z" />
+<path d="M9.10498 53.024C8.98964 53.024 8.8743 53.024 8.75896 53.024C7.32874 52.9314 6.01387 52.2603 5.04501 51.1493C4.09922 50.0616 3.59172 48.6266 3.68399 47.2148C3.73013 46.6131 3.86854 46.0576 4.09922 45.5253C3.7532 45.7105 3.40718 45.8956 3.08422 45.9882C2.76127 46.1039 2.50752 46.3354 2.39218 46.6362C2.34605 46.752 1.16958 49.6681 3.26877 52.5611C5.32182 55.3847 8.8051 55.4079 8.94351 55.4079C9.33567 55.4079 9.70475 55.1996 9.91237 54.8755C10.3507 54.1812 10.9504 53.3017 11.5963 52.3528C10.8582 52.7926 10.0046 53.024 9.10498 53.024Z" />
+<path d="M9.33559 41.6371L9.05877 42.5397C8.64354 43.9052 8.98956 45.4559 9.95842 46.5668C10.9273 47.7009 12.4267 48.2332 13.8339 47.9786L14.7796 47.8166C14.7796 47.8166 15.933 46.4742 16.579 45.6179C16.2099 45.7336 15.8408 45.8031 15.4486 45.8262C15.3563 45.8262 15.2641 45.8262 15.1718 45.8262C13.7416 45.8262 12.2652 45.2476 11.1118 44.2061C10.0738 43.2572 9.35865 41.6371 9.35865 41.6371H9.33559Z" />
+<path d="M33.6263 33.7913L34.2953 33.907C36.0254 34.2079 38.1246 33.5135 39.8085 32.0786C41.5156 30.5974 42.5075 28.6533 42.4844 26.8943V26.2C42.4844 26.2 41.5848 20.8306 41.5848 18.4467C41.5848 17.9838 41.308 17.5673 40.8927 17.3821C40.4544 17.1969 39.97 17.2895 39.647 17.6135L36.0023 21.1546C34.4106 22.6821 33.0035 23.5384 32.2883 23.6773C32.1038 23.7236 30.3968 23.9319 29.8893 23.7467C28.0208 23.0755 26.9366 22.3118 25.7832 20.7148L23.1765 17.1275C22.9227 16.7804 22.4844 16.5952 22.0692 16.6646C21.6309 16.7341 21.2849 17.0349 21.1465 17.4515C20.4314 19.6734 18.5859 25.8297 18.5859 25.8297L18.4936 26.6397C18.3091 28.3061 19.0011 30.0882 20.3391 31.4537L20.7082 31.7777C22.2768 33.1895 24.3299 33.7913 26.083 33.3747L26.8904 33.1895C26.8904 33.1895 29.3587 33.259 30.489 33.2358C30.5121 33.2358 30.5352 33.2358 30.5582 33.2358C31.504 33.2358 33.6263 33.8144 33.6263 33.8144V33.7913Z" />
+<path d="M41.9077 46.2891L42.369 46.2197C44.0069 45.9882 46.1291 44.7153 47.8823 42.8638C49.6585 40.9891 50.835 38.8367 50.9734 37.1935L51.0196 36.7306C51.0196 36.7306 50.7889 36.4297 50.5813 36.2908C50.5813 36.7769 50.5351 37.2629 50.4198 37.7952C50.0276 39.4616 48.9896 41.0585 47.5132 42.3083C46.0599 43.5581 44.3068 44.3218 42.6228 44.4607C42.4382 44.4607 42.2537 44.4607 42.0922 44.4607C41.6309 44.4607 41.1926 44.3913 40.7773 44.2987C41.1695 44.9467 41.5386 45.5948 41.9077 46.2659V46.2891Z" />
+<path d="M61.8154 42.748C61.654 42.2851 61.4002 41.938 61.1003 41.6371C61.3541 42.5397 61.2849 43.6275 60.8235 44.7616C60.2929 46.0345 59.3933 47.076 58.4014 47.6314C58.8166 47.7472 59.301 47.8166 59.8316 47.6314C60.5006 47.4 61.0311 46.8677 61.4233 46.0576C62.0231 44.831 62.1615 43.7201 61.8385 42.7712L61.8154 42.748Z" />
+<path d="M57.3403 51.6354C57.3403 51.6354 57.248 51.4734 57.1788 51.3808C56.7175 52.8851 55.218 54.5284 53.0266 55.6393C51.5502 56.403 50.0046 56.8196 48.6667 56.8196H48.6206C48.2053 56.8196 47.8132 56.7502 47.4672 56.6808C47.5594 56.8891 47.6748 57.0974 47.744 57.3057C47.9285 57.7223 48.3207 58 48.759 58C48.759 58 48.8513 58 48.9897 58C49.774 58 52.496 57.9074 54.3414 56.8428C56.5329 55.5699 57.5479 52.9314 57.594 52.8157C57.7555 52.3991 57.6402 51.9131 57.3403 51.6122V51.6354Z" />
+<path d="M45.1141 51.7974L45.6216 51.9362C46.7981 52.2603 48.5743 51.9362 50.2814 51.1031V51.0568L50.4659 50.9642C52.196 50.0847 53.534 48.7655 53.9953 47.5389L54.1799 47.0528C54.1799 47.0528 53.9261 46.2197 53.7877 45.8956L53.5109 45.317L54.1107 45.1087C54.9411 44.831 55.7254 43.9747 56.1637 42.8869L56.2791 42.6323C56.6251 41.614 56.6251 40.5956 56.2791 39.9013L55.9792 39.3227C55.9792 39.3227 55.7485 38.7904 55.3102 38.6284C55.1257 38.559 55.1949 38.7673 55.0103 38.6978C55.7485 40.6188 54.5028 43.8358 51.7808 46.6825C49.5893 48.9507 46.775 50.131 44.8373 50.1542C44.8143 50.1542 44.7912 50.1542 44.7681 50.1542C44.599 50.1542 44.4375 50.2004 44.2837 50.293C44.6297 50.9411 45.068 51.7742 45.068 51.7742L45.1141 51.7974Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_464">
-<rect width="60" height="53" fill="white" transform="translate(2 5)"/>
+<rect width="60" height="53"  transform="translate(2 5)"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-eye.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-eye.svg
index ff93e53a9..2914f61ce 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-eye.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-eye.svg
@@ -1,4 +1,4 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <path d="M20.3307 38.4C21.5089 38.4 22.4641 35.5346 22.4641 32C22.4641 28.4654 21.5089 25.6 20.3307 25.6C19.1525 25.6 18.1974 28.4654 18.1974 32C18.1974 35.5346 19.1525 38.4 20.3307 38.4Z" stroke="white" stroke-miterlimit="10"/>
-<path d="M49.7494 30.848C48.8926 30.7804 48.0583 30.541 47.296 30.144C46.9109 26.4048 45.3693 22.8789 42.8859 20.0571C40.4024 17.2354 37.1008 15.2585 33.4409 14.4016C29.7809 13.5447 25.9448 13.8506 22.4669 15.2766C18.9889 16.7026 16.0423 19.1777 14.0374 22.3573C13.572 23.04 13.0587 23.6887 12.5014 24.2987C11.4548 25.2943 10.6162 26.4876 10.0339 27.8095C9.45169 29.1315 9.13744 30.5558 9.10938 32C9.13098 33.4536 9.44424 34.888 10.0306 36.2182C10.6169 37.5484 11.4644 38.7474 12.5227 39.744C13.0857 40.3622 13.606 41.0179 14.08 41.7067C15.9353 44.6169 18.5852 46.9349 21.7163 48.3866C24.8474 49.8382 28.3287 50.3628 31.7486 49.8983C35.1685 49.4338 38.3838 47.9996 41.0142 45.7654C43.6447 43.5311 45.5803 40.5903 46.592 37.2907C47.6911 37.6844 48.8402 37.9214 50.0054 37.9947C51.6953 37.9301 53.3558 37.5313 54.8907 36.8213V29.0987C54.2048 29.7353 53.3925 30.2201 52.5066 30.5215C51.6207 30.823 50.6812 30.9342 49.7494 30.848ZM29.312 48.064H28.7574C27.4543 47.8064 26.2538 47.1765 25.3014 46.2507C24.1494 44.672 23.8294 40.1707 21.8454 40.2773C20.3947 40.2773 21.376 41.4293 20.0747 41.4933C17.024 41.6213 17.152 35.0933 15.232 35.0933C14.0587 35.0933 14.272 37.2267 14.72 39.2107L14.0374 38.4C13.1407 37.588 12.419 36.6016 11.9164 35.5012C11.4139 34.4008 11.1411 33.2094 11.1147 32C11.1396 30.7923 11.4097 29.6023 11.9084 28.5022C12.4071 27.402 13.1242 26.4146 14.016 25.6L14.8054 24.6613C14.3574 26.624 14.144 28.736 15.3174 28.7787C17.2374 28.7787 17.088 22.3787 20.16 22.3787C21.44 22.3787 20.48 23.5093 21.9094 23.5733C23.8934 23.68 24.2134 19.3067 25.3654 17.6C26.2292 16.743 27.3154 16.1445 28.5014 15.872H29.312C33.5725 15.872 37.6584 17.5644 40.671 20.577C43.6836 23.5896 45.376 27.6756 45.376 31.936C45.376 36.1964 43.6836 40.2824 40.671 43.295C37.6584 46.3075 33.5725 48 29.312 48V48.064Z" fill="white"/>
+<path d="M49.7494 30.848C48.8926 30.7804 48.0583 30.541 47.296 30.144C46.9109 26.4048 45.3693 22.8789 42.8859 20.0571C40.4024 17.2354 37.1008 15.2585 33.4409 14.4016C29.7809 13.5447 25.9448 13.8506 22.4669 15.2766C18.9889 16.7026 16.0423 19.1777 14.0374 22.3573C13.572 23.04 13.0587 23.6887 12.5014 24.2987C11.4548 25.2943 10.6162 26.4876 10.0339 27.8095C9.45169 29.1315 9.13744 30.5558 9.10938 32C9.13098 33.4536 9.44424 34.888 10.0306 36.2182C10.6169 37.5484 11.4644 38.7474 12.5227 39.744C13.0857 40.3622 13.606 41.0179 14.08 41.7067C15.9353 44.6169 18.5852 46.9349 21.7163 48.3866C24.8474 49.8382 28.3287 50.3628 31.7486 49.8983C35.1685 49.4338 38.3838 47.9996 41.0142 45.7654C43.6447 43.5311 45.5803 40.5903 46.592 37.2907C47.6911 37.6844 48.8402 37.9214 50.0054 37.9947C51.6953 37.9301 53.3558 37.5313 54.8907 36.8213V29.0987C54.2048 29.7353 53.3925 30.2201 52.5066 30.5215C51.6207 30.823 50.6812 30.9342 49.7494 30.848ZM29.312 48.064H28.7574C27.4543 47.8064 26.2538 47.1765 25.3014 46.2507C24.1494 44.672 23.8294 40.1707 21.8454 40.2773C20.3947 40.2773 21.376 41.4293 20.0747 41.4933C17.024 41.6213 17.152 35.0933 15.232 35.0933C14.0587 35.0933 14.272 37.2267 14.72 39.2107L14.0374 38.4C13.1407 37.588 12.419 36.6016 11.9164 35.5012C11.4139 34.4008 11.1411 33.2094 11.1147 32C11.1396 30.7923 11.4097 29.6023 11.9084 28.5022C12.4071 27.402 13.1242 26.4146 14.016 25.6L14.8054 24.6613C14.3574 26.624 14.144 28.736 15.3174 28.7787C17.2374 28.7787 17.088 22.3787 20.16 22.3787C21.44 22.3787 20.48 23.5093 21.9094 23.5733C23.8934 23.68 24.2134 19.3067 25.3654 17.6C26.2292 16.743 27.3154 16.1445 28.5014 15.872H29.312C33.5725 15.872 37.6584 17.5644 40.671 20.577C43.6836 23.5896 45.376 27.6756 45.376 31.936C45.376 36.1964 43.6836 40.2824 40.671 43.295C37.6584 46.3075 33.5725 48 29.312 48V48.064Z" />
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-fallopian-tube-left.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-fallopian-tube-left.svg
index e2929f03d..1f0939732 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-fallopian-tube-left.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-fallopian-tube-left.svg
@@ -1,5 +1,5 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.30664 8.25602C10.2826 7.06135 11.1146 13.9093 14.784 14.144C16.4513 14.2631 18.1068 13.7869 19.456 12.8L21.1626 17.8773C21.1626 17.8773 19.0293 19.8187 19.0293 21.184C19.0293 22.5493 20.16 27.2853 18.24 30.8907C16.32 34.496 13.568 36.928 12.8 39.5733C12.032 42.2187 12.8 43.1787 11.3706 49.28C10.7206 52.6276 9.29595 55.7765 7.21064 58.4747H3.30664V8.25602Z" fill="white"/>
-<path d="M44.7999 28.7787C42.4319 30.912 40.4053 30.912 38.1653 31.8933C39.1609 31.802 40.1643 31.9348 41.1019 32.2818C42.0396 32.6288 42.8876 33.1812 43.5839 33.8987C44.9706 35.072 47.4239 34.8373 48.1493 36.16C48.0426 33.0027 51.9679 30.272 53.4186 28.16C63.1253 13.8027 49.7066 4.26668 34.1333 7.14668C28.3075 8.28781 22.7491 10.517 17.7493 13.7173L19.3066 20.1173C23.5343 16.64 28.5168 14.1999 33.8559 12.992C44.5653 10.432 56.2559 18.624 44.7999 28.7787Z" fill="white"/>
-<path d="M38.7839 31.5947C38.6559 31.5947 28.6293 33.728 28.6293 33.728C23.6586 35.6267 26.4959 37.1627 32.2986 36.3947C36.8213 35.776 40.5973 34.2613 40.5119 35.2213C40.4266 36.1813 33.1093 40.0853 33.9413 41.5147C34.7733 42.944 42.9226 37.12 43.6693 38.5067C44.1 39.1713 44.4441 39.8882 44.6933 40.64C45.9306 43.392 47.1253 46.6987 48.1919 44.9067C48.6178 44.1014 48.8405 43.2043 48.8405 42.2933C48.8405 41.3824 48.6178 40.4852 48.1919 39.68C47.8364 38.5481 47.8364 37.3345 48.1919 36.2027L46.9333 33.0453L38.7839 31.5947Z" fill="white"/>
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.30664 8.25602C10.2826 7.06135 11.1146 13.9093 14.784 14.144C16.4513 14.2631 18.1068 13.7869 19.456 12.8L21.1626 17.8773C21.1626 17.8773 19.0293 19.8187 19.0293 21.184C19.0293 22.5493 20.16 27.2853 18.24 30.8907C16.32 34.496 13.568 36.928 12.8 39.5733C12.032 42.2187 12.8 43.1787 11.3706 49.28C10.7206 52.6276 9.29595 55.7765 7.21064 58.4747H3.30664V8.25602Z" />
+<path d="M44.7999 28.7787C42.4319 30.912 40.4053 30.912 38.1653 31.8933C39.1609 31.802 40.1643 31.9348 41.1019 32.2818C42.0396 32.6288 42.8876 33.1812 43.5839 33.8987C44.9706 35.072 47.4239 34.8373 48.1493 36.16C48.0426 33.0027 51.9679 30.272 53.4186 28.16C63.1253 13.8027 49.7066 4.26668 34.1333 7.14668C28.3075 8.28781 22.7491 10.517 17.7493 13.7173L19.3066 20.1173C23.5343 16.64 28.5168 14.1999 33.8559 12.992C44.5653 10.432 56.2559 18.624 44.7999 28.7787Z" />
+<path d="M38.7839 31.5947C38.6559 31.5947 28.6293 33.728 28.6293 33.728C23.6586 35.6267 26.4959 37.1627 32.2986 36.3947C36.8213 35.776 40.5973 34.2613 40.5119 35.2213C40.4266 36.1813 33.1093 40.0853 33.9413 41.5147C34.7733 42.944 42.9226 37.12 43.6693 38.5067C44.1 39.1713 44.4441 39.8882 44.6933 40.64C45.9306 43.392 47.1253 46.6987 48.1919 44.9067C48.6178 44.1014 48.8405 43.2043 48.8405 42.2933C48.8405 41.3824 48.6178 40.4852 48.1919 39.68C47.8364 38.5481 47.8364 37.3345 48.1919 36.2027L46.9333 33.0453L38.7839 31.5947Z" />
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-fallopian-tube-right.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-fallopian-tube-right.svg
index 6cfd54e8b..b6fd2cd32 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-fallopian-tube-right.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-fallopian-tube-right.svg
@@ -1,5 +1,5 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15.296 29.504C17.664 31.6373 19.6906 31.6373 21.9306 32.64C20.9367 32.546 19.9342 32.6753 18.9967 33.0186C18.0592 33.3619 17.2102 33.9104 16.512 34.624C15.1253 35.8186 12.672 35.5626 11.9466 36.9066C12.0533 33.728 8.12796 30.9973 6.69863 28.8853C-3.13604 14.528 10.2826 5.09865 25.7706 7.87198C31.7763 9.07178 37.506 11.3796 42.6666 14.6773L40.5333 20.6293C36.3282 17.2238 31.3806 14.8559 26.0906 13.7173C15.424 11.1787 3.7333 19.3707 15.296 29.504Z" fill="white"/>
-<path d="M21.2053 32.32C21.3333 32.32 31.3599 34.4533 31.3599 34.4533C36.3306 36.3733 33.4933 37.9093 27.6906 37.12C23.1679 36.5226 19.3919 34.9866 19.4773 35.968C19.5626 36.9493 26.8799 40.832 26.0479 42.368C25.2159 43.904 17.0666 37.9306 16.3413 39.3173C15.8986 39.9782 15.547 40.6958 15.2959 41.4506C14.0586 44.2026 12.8639 47.5093 11.7973 45.7173C11.3766 44.9104 11.157 44.0139 11.157 43.104C11.157 42.194 11.3766 41.2975 11.7973 40.4906C12.1541 39.359 12.1541 38.145 11.7973 37.0133L12.8426 33.8986L21.2053 32.32Z" fill="white"/>
-<path d="M56.6827 9.00265C49.728 7.80798 48.8747 14.6346 45.2267 14.9333C43.5313 15.007 41.8658 14.4695 40.5333 13.4186L38.8267 18.5173C38.8267 18.5173 40.96 20.4373 40.96 21.8027C40.96 23.168 39.8293 27.9253 41.7493 31.5093C43.6693 35.0933 46.3573 37.6533 47.04 40.32C47.7227 42.9866 47.168 43.904 48.5547 50.0266C49.2047 53.3742 50.6293 56.5231 52.7147 59.2213H56.6187L56.6827 9.00265Z" fill="white"/>
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.296 29.504C17.664 31.6373 19.6906 31.6373 21.9306 32.64C20.9367 32.546 19.9342 32.6753 18.9967 33.0186C18.0592 33.3619 17.2102 33.9104 16.512 34.624C15.1253 35.8186 12.672 35.5626 11.9466 36.9066C12.0533 33.728 8.12796 30.9973 6.69863 28.8853C-3.13604 14.528 10.2826 5.09865 25.7706 7.87198C31.7763 9.07178 37.506 11.3796 42.6666 14.6773L40.5333 20.6293C36.3282 17.2238 31.3806 14.8559 26.0906 13.7173C15.424 11.1787 3.7333 19.3707 15.296 29.504Z" />
+<path d="M21.2053 32.32C21.3333 32.32 31.3599 34.4533 31.3599 34.4533C36.3306 36.3733 33.4933 37.9093 27.6906 37.12C23.1679 36.5226 19.3919 34.9866 19.4773 35.968C19.5626 36.9493 26.8799 40.832 26.0479 42.368C25.2159 43.904 17.0666 37.9306 16.3413 39.3173C15.8986 39.9782 15.547 40.6958 15.2959 41.4506C14.0586 44.2026 12.8639 47.5093 11.7973 45.7173C11.3766 44.9104 11.157 44.0139 11.157 43.104C11.157 42.194 11.3766 41.2975 11.7973 40.4906C12.1541 39.359 12.1541 38.145 11.7973 37.0133L12.8426 33.8986L21.2053 32.32Z" />
+<path d="M56.6827 9.00265C49.728 7.80798 48.8747 14.6346 45.2267 14.9333C43.5313 15.007 41.8658 14.4695 40.5333 13.4186L38.8267 18.5173C38.8267 18.5173 40.96 20.4373 40.96 21.8027C40.96 23.168 39.8293 27.9253 41.7493 31.5093C43.6693 35.0933 46.3573 37.6533 47.04 40.32C47.7227 42.9866 47.168 43.904 48.5547 50.0266C49.2047 53.3742 50.6293 56.5231 52.7147 59.2213H56.6187L56.6827 9.00265Z" />
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-heart.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-heart.svg
index 0ba392809..419d60ee3 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-heart.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-heart.svg
@@ -1,11 +1,11 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_250)">
-<path d="M50.112 33.7707C50.112 33.7707 47.9787 24.9173 42.368 22.4853C40.7254 21.952 35.968 23.3387 38.848 30.3573C38.144 29.5253 35.4987 24.3627 37.7174 21.0347C38.4945 20.0244 39.4881 19.2011 40.6252 18.6252C41.7622 18.0493 43.0138 17.7355 44.288 17.7067C44.7517 17.7108 45.21 17.607 45.6266 17.4033C46.0431 17.1997 46.4066 16.9018 46.6881 16.5334C46.9696 16.1649 47.1615 15.736 47.2485 15.2805C47.3355 14.8251 47.3152 14.3556 47.1894 13.9093C46.72 10.6667 42.4747 11.1147 42.4747 11.1147C42.4747 11.1147 31.488 10.9013 28.864 18.1547C28.864 9.34399 40.128 9.30133 40.128 9.30133C40.128 6.57066 30.6774 4.88533 24.64 9.55733C16.512 15.8293 16.576 26.624 23.0827 34.816C21.2232 33.5705 19.6776 31.911 18.5672 29.9677C17.4567 28.0245 16.8117 25.8504 16.6827 23.616C15.616 24.9813 12.416 30.016 13.3547 39.1893C14.6987 53.056 44.16 64.1493 49.0027 57.1307C53.8454 50.112 50.112 33.7707 50.112 33.7707Z" fill="white"/>
-<path d="M18.56 12.2453C17.8347 10.816 12.16 10.9227 12.16 12.5653V24.5973C13.1629 22.7084 14.5597 21.057 16.256 19.7547C16.3402 17.0908 17.1357 14.498 18.56 12.2453Z" fill="white"/>
+<path d="M50.112 33.7707C50.112 33.7707 47.9787 24.9173 42.368 22.4853C40.7254 21.952 35.968 23.3387 38.848 30.3573C38.144 29.5253 35.4987 24.3627 37.7174 21.0347C38.4945 20.0244 39.4881 19.2011 40.6252 18.6252C41.7622 18.0493 43.0138 17.7355 44.288 17.7067C44.7517 17.7108 45.21 17.607 45.6266 17.4033C46.0431 17.1997 46.4066 16.9018 46.6881 16.5334C46.9696 16.1649 47.1615 15.736 47.2485 15.2805C47.3355 14.8251 47.3152 14.3556 47.1894 13.9093C46.72 10.6667 42.4747 11.1147 42.4747 11.1147C42.4747 11.1147 31.488 10.9013 28.864 18.1547C28.864 9.34399 40.128 9.30133 40.128 9.30133C40.128 6.57066 30.6774 4.88533 24.64 9.55733C16.512 15.8293 16.576 26.624 23.0827 34.816C21.2232 33.5705 19.6776 31.911 18.5672 29.9677C17.4567 28.0245 16.8117 25.8504 16.6827 23.616C15.616 24.9813 12.416 30.016 13.3547 39.1893C14.6987 53.056 44.16 64.1493 49.0027 57.1307C53.8454 50.112 50.112 33.7707 50.112 33.7707Z" />
+<path d="M18.56 12.2453C17.8347 10.816 12.16 10.9227 12.16 12.5653V24.5973C13.1629 22.7084 14.5597 21.057 16.256 19.7547C16.3402 17.0908 17.1357 14.498 18.56 12.2453Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_250">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-kidney-left.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-kidney-left.svg
index 14bafa2a2..7d8a2434c 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-kidney-left.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-kidney-left.svg
@@ -1,11 +1,11 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_255)">
-<path d="M26.368 27.3067C25.6784 25.9132 25.3137 24.3814 25.3014 22.8267C25.3014 22.8267 21.9734 23.5947 19.7974 19.392C17.1947 14.3787 19.2 9.25867 24.6827 6.40001C34.2614 1.53601 42.6667 12.8 45.0987 17.6853C47.5307 22.5707 50.9867 36.2667 42.3894 40.768C37.3974 43.328 32.2134 43.456 29.5894 38.2293C28.833 36.9897 28.5086 35.5344 28.6668 34.0909C28.8251 32.6474 29.4571 31.297 30.464 30.2507C28.7811 29.8108 27.3214 28.7617 26.368 27.3067Z" fill="white"/>
-<path d="M24.0426 25.8987C24.1611 26.5911 24.369 27.2652 24.6613 27.904C23.8975 28.4285 23.2703 29.1283 22.8324 29.9448C22.3944 30.7614 22.1584 31.6709 22.144 32.5973V59.072H20.0106V32.5973C20.0389 31.2258 20.426 29.8857 21.1334 28.7104C21.8408 27.5351 22.8439 26.5656 24.0426 25.8987Z" fill="white"/>
+<path d="M26.368 27.3067C25.6784 25.9132 25.3137 24.3814 25.3014 22.8267C25.3014 22.8267 21.9734 23.5947 19.7974 19.392C17.1947 14.3787 19.2 9.25867 24.6827 6.40001C34.2614 1.53601 42.6667 12.8 45.0987 17.6853C47.5307 22.5707 50.9867 36.2667 42.3894 40.768C37.3974 43.328 32.2134 43.456 29.5894 38.2293C28.833 36.9897 28.5086 35.5344 28.6668 34.0909C28.8251 32.6474 29.4571 31.297 30.464 30.2507C28.7811 29.8108 27.3214 28.7617 26.368 27.3067Z" />
+<path d="M24.0426 25.8987C24.1611 26.5911 24.369 27.2652 24.6613 27.904C23.8975 28.4285 23.2703 29.1283 22.8324 29.9448C22.3944 30.7614 22.1584 31.6709 22.144 32.5973V59.072H20.0106V32.5973C20.0389 31.2258 20.426 29.8857 21.1334 28.7104C21.8408 27.5351 22.8439 26.5656 24.0426 25.8987Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_255">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-kidney-right.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-kidney-right.svg
index e175e06c9..d7304b6e2 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-kidney-right.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-kidney-right.svg
@@ -1,11 +1,11 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_260)">
-<path d="M35.072 27.52C35.7631 26.127 36.1279 24.5949 36.1387 23.04C36.1387 23.04 39.488 23.8293 41.664 19.6053C44.2453 14.592 42.2187 9.47199 36.7787 6.67732C27.1787 1.74932 18.8373 13.0773 16.3413 17.8987C13.8453 22.72 10.4533 36.5653 19.0507 41.0027C24.0427 43.5627 29.2267 43.6693 31.8507 38.4427C32.607 37.203 32.9314 35.7478 32.7732 34.3042C32.6149 32.8607 31.983 31.5103 30.976 30.464C32.6634 30.0337 34.1263 28.9823 35.072 27.52Z" fill="white"/>
-<path d="M37.3974 26.112C37.2891 26.8042 37.0882 27.4787 36.8 28.1173C37.5566 28.6524 38.1767 29.358 38.6103 30.177C39.0439 30.996 39.2788 31.9055 39.296 32.832V59.2853H41.4294V32.832C41.407 31.4564 41.0225 30.111 40.3147 28.9312C39.6068 27.7515 38.6006 26.7791 37.3974 26.112Z" fill="white"/>
+<path d="M35.072 27.52C35.7631 26.127 36.1279 24.5949 36.1387 23.04C36.1387 23.04 39.488 23.8293 41.664 19.6053C44.2453 14.592 42.2187 9.47199 36.7787 6.67732C27.1787 1.74932 18.8373 13.0773 16.3413 17.8987C13.8453 22.72 10.4533 36.5653 19.0507 41.0027C24.0427 43.5627 29.2267 43.6693 31.8507 38.4427C32.607 37.203 32.9314 35.7478 32.7732 34.3042C32.6149 32.8607 31.983 31.5103 30.976 30.464C32.6634 30.0337 34.1263 28.9823 35.072 27.52Z" />
+<path d="M37.3974 26.112C37.2891 26.8042 37.0882 27.4787 36.8 28.1173C37.5566 28.6524 38.1767 29.358 38.6103 30.177C39.0439 30.996 39.2788 31.9055 39.296 32.832V59.2853H41.4294V32.832C41.407 31.4564 41.0225 30.111 40.3147 28.9312C39.6068 27.7515 38.6006 26.7791 37.3974 26.112Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_260">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-kidneys.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-kidneys.svg
index cb5643790..45fc0b4be 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-kidneys.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-kidneys.svg
@@ -1,13 +1,13 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_265)">
-<path d="M23.1893 25.2373C23.4883 23.718 23.4446 22.151 23.0613 20.6507C23.0613 20.6507 26.4746 20.6507 27.4773 15.8933C28.6933 10.3893 25.344 5.97334 19.4133 4.672C8.87464 2.41067 3.75464 15.5307 2.60264 20.8C1.45064 26.0693 1.7493 40.3627 11.136 42.4107C16.64 43.584 21.6746 42.4107 22.912 36.608C23.3267 35.218 23.2666 33.7294 22.7412 32.3773C22.2158 31.0253 21.2551 29.8867 20.0106 29.1413C21.5139 28.2747 22.6454 26.885 23.1893 25.2373Z" fill="white"/>
-<path d="M40.8107 25.2373C40.5117 23.718 40.5555 22.151 40.9387 20.6507C40.9387 20.6507 37.5254 20.6507 36.5227 15.8933C35.3067 10.3893 38.6561 5.97334 44.5867 4.672C55.1254 2.41067 60.2454 15.5307 61.3974 20.8C62.5494 26.0693 62.2507 40.3627 52.8641 42.4107C47.3601 43.584 42.3254 42.4107 41.0881 36.608C40.6733 35.218 40.7334 33.7294 41.2588 32.3773C41.7842 31.0253 42.7449 29.8867 43.9894 29.1413C42.4862 28.2747 41.3546 26.885 40.8107 25.2373Z" fill="white"/>
-<path d="M27.5627 31.1467V59.392H29.6961V31.1467C29.6797 29.6648 29.2776 28.2126 28.5295 26.9333C27.7813 25.654 26.7129 24.5916 25.4294 23.8507C25.4131 24.2888 25.356 24.7245 25.2587 25.152C25.1939 25.4708 25.0863 25.7794 24.9387 26.0693C25.7396 26.6544 26.3936 27.4177 26.849 28.2988C27.3043 29.18 27.5487 30.1549 27.5627 31.1467Z" fill="white"/>
-<path d="M36.4587 31.1467V59.392H34.3253V31.1467C34.3417 29.6648 34.7438 28.2126 35.4919 26.9333C36.24 25.654 37.3085 24.5916 38.592 23.8507C38.592 24.2773 38.592 24.704 38.7627 25.152C38.8468 25.4652 38.9538 25.7718 39.0826 26.0693C38.2817 26.6544 37.6278 27.4177 37.1724 28.2988C36.717 29.18 36.4727 30.1549 36.4587 31.1467Z" fill="white"/>
+<path d="M23.1893 25.2373C23.4883 23.718 23.4446 22.151 23.0613 20.6507C23.0613 20.6507 26.4746 20.6507 27.4773 15.8933C28.6933 10.3893 25.344 5.97334 19.4133 4.672C8.87464 2.41067 3.75464 15.5307 2.60264 20.8C1.45064 26.0693 1.7493 40.3627 11.136 42.4107C16.64 43.584 21.6746 42.4107 22.912 36.608C23.3267 35.218 23.2666 33.7294 22.7412 32.3773C22.2158 31.0253 21.2551 29.8867 20.0106 29.1413C21.5139 28.2747 22.6454 26.885 23.1893 25.2373Z" />
+<path d="M40.8107 25.2373C40.5117 23.718 40.5555 22.151 40.9387 20.6507C40.9387 20.6507 37.5254 20.6507 36.5227 15.8933C35.3067 10.3893 38.6561 5.97334 44.5867 4.672C55.1254 2.41067 60.2454 15.5307 61.3974 20.8C62.5494 26.0693 62.2507 40.3627 52.8641 42.4107C47.3601 43.584 42.3254 42.4107 41.0881 36.608C40.6733 35.218 40.7334 33.7294 41.2588 32.3773C41.7842 31.0253 42.7449 29.8867 43.9894 29.1413C42.4862 28.2747 41.3546 26.885 40.8107 25.2373Z" />
+<path d="M27.5627 31.1467V59.392H29.6961V31.1467C29.6797 29.6648 29.2776 28.2126 28.5295 26.9333C27.7813 25.654 26.7129 24.5916 25.4294 23.8507C25.4131 24.2888 25.356 24.7245 25.2587 25.152C25.1939 25.4708 25.0863 25.7794 24.9387 26.0693C25.7396 26.6544 26.3936 27.4177 26.849 28.2988C27.3043 29.18 27.5487 30.1549 27.5627 31.1467Z" />
+<path d="M36.4587 31.1467V59.392H34.3253V31.1467C34.3417 29.6648 34.7438 28.2126 35.4919 26.9333C36.24 25.654 37.3085 24.5916 38.592 23.8507C38.592 24.2773 38.592 24.704 38.7627 25.152C38.8468 25.4652 38.9538 25.7718 39.0826 26.0693C38.2817 26.6544 37.6278 27.4177 37.1724 28.2988C36.717 29.18 36.4727 30.1549 36.4587 31.1467Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_265">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-knee.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-knee.svg
index 7b73adeda..8aa72a807 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-knee.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-knee.svg
@@ -1,10 +1,10 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_272)">
-<path d="M46.3574 19.4347C44.8001 17.0667 35.2214 12.4587 24.4481 8.53332C15.9147 5.50399 14.2934 4.43732 4.09607 4.37332V15.04C4.09607 15.04 25.0027 18.432 27.3281 18.944C29.6534 19.456 32.9174 17.984 35.1147 19.328C37.3121 20.672 37.9307 21.9093 37.0347 26.0693C36.1387 30.2293 33.3867 32.1493 31.1894 31.5947C27.1361 30.6133 27.8614 25.0667 26.4961 24.576C23.6587 23.5733 4.09607 20.3093 4.09607 20.3093V36.928C17.3867 33.6853 23.2961 35.2427 23.2961 35.2427C23.2961 35.2427 18.3254 45.9093 17.9201 52.1173C17.6891 54.6671 17.8619 57.2374 18.4321 59.7333H27.8401C27.8401 59.7333 30.6347 45.2267 30.2934 41.792C29.9521 38.3573 26.2827 33.664 26.5387 32.384C26.7947 31.104 28.4161 34.0267 32.6401 34.0267C35.9467 34.0267 37.1627 31.0827 38.4001 31.6587C39.6374 32.2347 36.9921 37.5253 36.5441 40.6827C36.0961 43.84 33.6001 59.7333 33.6001 59.7333H40.5334C42.4766 52.4199 43.7969 44.955 44.4801 37.4187C44.9921 33.792 49.0667 23.3387 46.3574 19.4347ZM41.6641 28.48C40.0427 28.672 40.7041 25.2373 40.3841 23.3387C40.0641 21.44 38.5494 19.2853 39.9574 19.072C41.02 19.1073 42.0312 19.5381 42.7928 20.28C43.5543 21.0218 44.0115 22.0213 44.0747 23.0827C44.0961 25.728 43.2854 28.2667 41.6641 28.48Z" fill="white"/>
+<path d="M46.3574 19.4347C44.8001 17.0667 35.2214 12.4587 24.4481 8.53332C15.9147 5.50399 14.2934 4.43732 4.09607 4.37332V15.04C4.09607 15.04 25.0027 18.432 27.3281 18.944C29.6534 19.456 32.9174 17.984 35.1147 19.328C37.3121 20.672 37.9307 21.9093 37.0347 26.0693C36.1387 30.2293 33.3867 32.1493 31.1894 31.5947C27.1361 30.6133 27.8614 25.0667 26.4961 24.576C23.6587 23.5733 4.09607 20.3093 4.09607 20.3093V36.928C17.3867 33.6853 23.2961 35.2427 23.2961 35.2427C23.2961 35.2427 18.3254 45.9093 17.9201 52.1173C17.6891 54.6671 17.8619 57.2374 18.4321 59.7333H27.8401C27.8401 59.7333 30.6347 45.2267 30.2934 41.792C29.9521 38.3573 26.2827 33.664 26.5387 32.384C26.7947 31.104 28.4161 34.0267 32.6401 34.0267C35.9467 34.0267 37.1627 31.0827 38.4001 31.6587C39.6374 32.2347 36.9921 37.5253 36.5441 40.6827C36.0961 43.84 33.6001 59.7333 33.6001 59.7333H40.5334C42.4766 52.4199 43.7969 44.955 44.4801 37.4187C44.9921 33.792 49.0667 23.3387 46.3574 19.4347ZM41.6641 28.48C40.0427 28.672 40.7041 25.2373 40.3841 23.3387C40.0641 21.44 38.5494 19.2853 39.9574 19.072C41.02 19.1073 42.0312 19.5381 42.7928 20.28C43.5543 21.0218 44.0115 22.0213 44.0747 23.0827C44.0961 25.728 43.2854 28.2667 41.6641 28.48Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_272">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-large-intestine.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-large-intestine.svg
index 8641bead2..9d5150fac 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-large-intestine.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-large-intestine.svg
@@ -1,10 +1,10 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_276)">
-<path d="M58.6667 26.8587C58.6691 26.4198 58.5747 25.9859 58.3904 25.5877C58.206 25.1894 57.9362 24.8368 57.6 24.5547C57.8945 24.2825 58.1297 23.9526 58.2912 23.5856C58.4527 23.2186 58.5369 22.8223 58.5387 22.4213C58.5321 21.9206 58.3997 21.4296 58.1536 20.9934C57.9076 20.5573 57.5558 20.19 57.1307 19.9253C57.5586 19.6637 57.9125 19.297 58.1589 18.8602C58.4053 18.4234 58.5361 17.9308 58.5387 17.4293C58.5348 17.0307 58.4517 16.6368 58.2942 16.2706C58.1367 15.9043 57.908 15.5731 57.6214 15.296L57.8987 14.6347C58.2115 13.8648 58.3649 13.0394 58.3495 12.2085C58.3342 11.3776 58.1504 10.5585 57.8094 9.8007C57.4684 9.04287 56.9772 8.36211 56.3655 7.79958C55.7538 7.23706 55.0344 6.80447 54.2507 6.52799C53.1192 6.10208 51.8949 5.98431 50.7029 6.18672C49.511 6.38912 48.3942 6.90444 47.4667 7.67999C46.9111 7.30516 46.2594 7.09783 45.5894 7.08265C44.8005 6.986 44.0054 7.20548 43.3779 7.69314C42.7503 8.18081 42.3412 8.89702 42.24 9.68532V10.1547C41.9393 9.71849 41.5381 9.36099 41.0703 9.11224C40.6025 8.8635 40.0818 8.7308 39.552 8.72532C38.9183 8.69135 38.2887 8.84533 37.7421 9.16794C37.1956 9.49055 36.7565 9.9674 36.48 10.5387C36.1721 10.1212 35.7703 9.78196 35.3071 9.54848C34.8438 9.31501 34.3321 9.1938 33.8134 9.19465C33.1923 9.15731 32.5737 9.30062 32.0324 9.60727C31.491 9.91392 31.05 10.3708 30.7627 10.9227C30.7517 10.5369 30.6644 10.1572 30.5059 9.80541C30.3474 9.45359 30.1208 9.13665 29.8392 8.87287C29.5575 8.60908 29.2264 8.40368 28.865 8.26851C28.5036 8.13334 28.119 8.07108 27.7334 8.08532C27.3879 8.08323 27.0437 8.12626 26.7094 8.21332C26.5002 7.34714 26.001 6.57857 25.2948 6.03526C24.5885 5.49196 23.7176 5.20663 22.8267 5.22665C22.1407 5.18635 21.4548 5.30828 20.8247 5.58256C20.1946 5.85684 19.638 6.27575 19.2 6.80532L18.5387 6.01599C17.7342 5.16056 16.6641 4.60229 15.5022 4.43188C14.3403 4.26147 13.155 4.48894 12.1387 5.07732C11.4943 5.42917 10.9718 5.96834 10.6404 6.62352C10.309 7.27871 10.1843 8.01905 10.2827 8.74665C9.38459 8.73985 8.50724 9.01664 7.77561 9.53759C7.04399 10.0585 6.49542 10.7971 6.20804 11.648C6.08586 12.169 6.09812 12.7125 6.24365 13.2275C6.38919 13.7425 6.66323 14.212 7.04004 14.592C6.34475 15.0356 5.83621 15.7187 5.61071 16.512C5.38353 17.3089 5.45028 18.161 5.79879 18.9129C6.14731 19.6647 6.75439 20.2663 7.50937 20.608C6.96613 20.7012 6.47183 20.9795 6.11025 21.3955C5.74867 21.8115 5.54203 22.3397 5.52537 22.8907C5.4516 23.4818 5.59169 24.0798 5.92033 24.5767C6.24898 25.0736 6.7445 25.4365 7.31737 25.6C6.86002 25.8005 6.47 26.1284 6.19387 26.5445C5.91773 26.9606 5.76713 27.4473 5.76004 27.9467V28.5227C5.77682 29.1245 5.99678 29.703 6.38413 30.1639C6.77147 30.6248 7.30341 30.9411 7.89337 31.0613C7.12021 31.5437 6.48062 32.2126 6.03332 33.0065C5.58602 33.8005 5.34533 34.6941 5.33337 35.6053V36.8213C5.37252 38.3039 5.99486 39.7112 7.06528 40.7376C8.13571 41.7641 9.56782 42.327 11.0507 42.304V44.5867C11.0507 44.8922 11.1721 45.1852 11.3881 45.4012C11.6042 45.6173 11.8972 45.7387 12.2027 45.7387C12.5082 45.7387 12.8013 45.6173 13.0173 45.4012C13.2333 45.1852 13.3547 44.8922 13.3547 44.5867V42.304C14.8139 42.2881 16.2104 41.7087 17.2521 40.6868C18.2938 39.665 18.9001 38.2799 18.944 36.8213V35.6053C18.9311 34.6865 18.6857 33.7859 18.2305 32.9875C17.7754 32.1892 17.1255 31.5192 16.3414 31.04C16.9296 30.9163 17.4594 30.599 17.8462 30.1388C18.2329 29.6786 18.4542 29.1021 18.4747 28.5013V27.9253C18.481 27.508 18.3852 27.0954 18.1955 26.7236C18.0059 26.3518 17.7282 26.0319 17.3867 25.792C17.8626 25.3369 18.1516 24.7208 18.1974 24.064C18.2362 23.4453 18.0714 22.8308 17.728 22.3147C18.3564 21.8768 18.8157 21.2368 19.0294 20.5013C19.2178 19.8563 19.2154 19.1705 19.0223 18.5269C18.8292 17.8833 18.4537 17.3094 17.9414 16.8747C18.3819 16.7923 18.8066 16.6412 19.2 16.4267C19.5965 16.866 20.0801 17.2181 20.62 17.4605C21.1598 17.7029 21.7443 17.8303 22.336 17.8347C22.972 17.8553 23.605 17.7389 24.192 17.4933V17.9413C24.2414 18.6996 24.582 19.4094 25.1426 19.9223C25.7032 20.4352 26.4404 20.7114 27.2 20.6933C27.8242 20.7322 28.4463 20.5897 28.9913 20.2832C29.5364 19.9766 29.9811 19.5189 30.272 18.9653C30.3215 19.7407 30.6734 20.4656 31.2519 20.9842C31.8303 21.5029 32.5892 21.7738 33.3654 21.7387C34.0019 21.7736 34.6344 21.6177 35.1818 21.2908C35.7291 20.9639 36.1663 20.481 36.4374 19.904C36.7385 20.325 37.1354 20.6684 37.5953 20.9058C38.0553 21.1432 38.5651 21.2678 39.0827 21.2693C39.858 21.3485 40.6338 21.1236 41.2467 20.6421C41.8595 20.1606 42.2615 19.46 42.368 18.688V18.2827C42.6747 18.718 43.08 19.0744 43.551 19.3229C44.0219 19.5713 44.545 19.7047 45.0774 19.712C45.372 19.7094 45.6654 19.6736 45.952 19.6053C46.0721 19.7298 46.2085 19.8374 46.3574 19.9253C45.9362 20.1942 45.5876 20.5625 45.342 20.9977C45.0965 21.4329 44.9617 21.9218 44.9494 22.4213C44.9589 22.8636 45.0674 23.2982 45.2667 23.6932C45.466 24.0882 45.7512 24.4335 46.1014 24.704C45.8109 24.9793 45.5782 25.3097 45.417 25.676C45.2558 26.0424 45.1694 26.4372 45.1627 26.8373C45.1724 27.241 45.2645 27.6384 45.4332 28.0053C45.602 28.3721 45.8438 28.7006 46.144 28.9707C45.7486 29.3693 45.4357 29.8421 45.2234 30.362C45.0111 30.8818 44.9035 31.4385 44.9067 32C44.908 32.7552 45.1224 33.4946 45.5254 34.1333C44.6437 34.8245 44.0384 35.8082 43.8187 36.9067C43.8187 37.0347 43.8187 37.184 43.8187 37.312C43.6091 37.4538 43.4221 37.6264 43.264 37.824C42.9598 38.2352 42.7752 38.7225 42.7307 39.232C42.0729 39.4949 41.5084 39.948 41.1094 40.5333C40.5287 40.0382 39.8188 39.7189 39.0631 39.6131C38.3073 39.5073 37.537 39.6193 36.8427 39.936C36.2089 39.2973 35.4543 38.791 34.6229 38.4467C33.7915 38.1025 32.8999 37.927 32 37.9307H31.5734C30.7161 37.9137 29.8638 38.0658 29.0653 38.3783C28.2668 38.6907 27.5376 39.1575 26.9195 39.7518C26.3014 40.3461 25.8065 41.0564 25.4629 41.842C25.1194 42.6277 24.934 43.4733 24.9174 44.3307V44.736C24.9182 45.5674 25.0889 46.3899 25.4191 47.153C25.7493 47.916 26.2319 48.6035 26.8374 49.1733C26.4789 49.5559 26.2738 50.0572 26.2614 50.5813C26.2556 51.0958 26.4359 51.5951 26.7691 51.9871C27.1023 52.3791 27.566 52.6375 28.0747 52.7147C28.0747 52.7147 28.0747 52.8427 28.0747 52.928C28.0815 53.3371 28.2058 53.7356 28.4327 54.076C28.6597 54.4164 28.9797 54.6844 29.3547 54.848V57.6C29.4098 58.1701 29.6751 58.6992 30.0991 59.0842C30.5231 59.4692 31.0753 59.6825 31.648 59.6825C32.2208 59.6825 32.773 59.4692 33.1969 59.0842C33.6209 58.6992 33.8863 58.1701 33.9414 57.6V54.5707C34.2398 54.3843 34.4875 54.1271 34.6624 53.8219C34.8374 53.5167 34.9341 53.173 34.944 52.8213C34.944 52.8213 34.944 52.8213 34.944 52.6933H35.4987C36.1605 52.6207 36.7781 52.326 37.2508 51.8572C37.7235 51.3883 38.0233 50.7731 38.1014 50.112C38.1014 49.3013 37.9947 49.2587 37.9947 49.2587C38.3145 49.6363 38.7187 49.9334 39.1745 50.1261C39.6303 50.3188 40.125 50.4017 40.6187 50.368C41.2217 50.3389 41.799 50.1153 42.2643 49.7308C42.7296 49.3462 43.0579 48.8213 43.2 48.2347C43.7546 48.8408 44.4723 49.2739 45.267 49.482C46.0617 49.6902 46.8996 49.6645 47.68 49.408C48.1581 49.2452 48.5957 48.982 48.9637 48.6361C49.3316 48.2903 49.6213 47.8697 49.8134 47.4027C50.3649 47.7789 51.0416 47.9248 51.6992 47.8092C52.3568 47.6937 52.9432 47.3258 53.3334 46.784C53.6126 46.3856 53.798 45.9291 53.8756 45.4487C53.9532 44.9684 53.921 44.4767 53.7814 44.0107C54.4653 43.73 55.0679 43.2822 55.5338 42.7082C55.9997 42.1342 56.3141 41.4524 56.448 40.7253C56.6315 39.9109 56.6189 39.0646 56.4112 38.256C56.2035 37.4474 55.8067 36.6998 55.2534 36.0747C56.1599 35.8407 56.9644 35.315 57.5426 34.5786C58.1209 33.8423 58.4409 32.9362 58.4534 32C58.4374 30.9951 58.0672 30.028 57.408 29.2693C57.7975 28.9996 58.1156 28.6392 58.3348 28.2193C58.5541 27.7994 58.668 27.3324 58.6667 26.8587Z" fill="white"/>
+<path d="M58.6667 26.8587C58.6691 26.4198 58.5747 25.9859 58.3904 25.5877C58.206 25.1894 57.9362 24.8368 57.6 24.5547C57.8945 24.2825 58.1297 23.9526 58.2912 23.5856C58.4527 23.2186 58.5369 22.8223 58.5387 22.4213C58.5321 21.9206 58.3997 21.4296 58.1536 20.9934C57.9076 20.5573 57.5558 20.19 57.1307 19.9253C57.5586 19.6637 57.9125 19.297 58.1589 18.8602C58.4053 18.4234 58.5361 17.9308 58.5387 17.4293C58.5348 17.0307 58.4517 16.6368 58.2942 16.2706C58.1367 15.9043 57.908 15.5731 57.6214 15.296L57.8987 14.6347C58.2115 13.8648 58.3649 13.0394 58.3495 12.2085C58.3342 11.3776 58.1504 10.5585 57.8094 9.8007C57.4684 9.04287 56.9772 8.36211 56.3655 7.79958C55.7538 7.23706 55.0344 6.80447 54.2507 6.52799C53.1192 6.10208 51.8949 5.98431 50.7029 6.18672C49.511 6.38912 48.3942 6.90444 47.4667 7.67999C46.9111 7.30516 46.2594 7.09783 45.5894 7.08265C44.8005 6.986 44.0054 7.20548 43.3779 7.69314C42.7503 8.18081 42.3412 8.89702 42.24 9.68532V10.1547C41.9393 9.71849 41.5381 9.36099 41.0703 9.11224C40.6025 8.8635 40.0818 8.7308 39.552 8.72532C38.9183 8.69135 38.2887 8.84533 37.7421 9.16794C37.1956 9.49055 36.7565 9.9674 36.48 10.5387C36.1721 10.1212 35.7703 9.78196 35.3071 9.54848C34.8438 9.31501 34.3321 9.1938 33.8134 9.19465C33.1923 9.15731 32.5737 9.30062 32.0324 9.60727C31.491 9.91392 31.05 10.3708 30.7627 10.9227C30.7517 10.5369 30.6644 10.1572 30.5059 9.80541C30.3474 9.45359 30.1208 9.13665 29.8392 8.87287C29.5575 8.60908 29.2264 8.40368 28.865 8.26851C28.5036 8.13334 28.119 8.07108 27.7334 8.08532C27.3879 8.08323 27.0437 8.12626 26.7094 8.21332C26.5002 7.34714 26.001 6.57857 25.2948 6.03526C24.5885 5.49196 23.7176 5.20663 22.8267 5.22665C22.1407 5.18635 21.4548 5.30828 20.8247 5.58256C20.1946 5.85684 19.638 6.27575 19.2 6.80532L18.5387 6.01599C17.7342 5.16056 16.6641 4.60229 15.5022 4.43188C14.3403 4.26147 13.155 4.48894 12.1387 5.07732C11.4943 5.42917 10.9718 5.96834 10.6404 6.62352C10.309 7.27871 10.1843 8.01905 10.2827 8.74665C9.38459 8.73985 8.50724 9.01664 7.77561 9.53759C7.04399 10.0585 6.49542 10.7971 6.20804 11.648C6.08586 12.169 6.09812 12.7125 6.24365 13.2275C6.38919 13.7425 6.66323 14.212 7.04004 14.592C6.34475 15.0356 5.83621 15.7187 5.61071 16.512C5.38353 17.3089 5.45028 18.161 5.79879 18.9129C6.14731 19.6647 6.75439 20.2663 7.50937 20.608C6.96613 20.7012 6.47183 20.9795 6.11025 21.3955C5.74867 21.8115 5.54203 22.3397 5.52537 22.8907C5.4516 23.4818 5.59169 24.0798 5.92033 24.5767C6.24898 25.0736 6.7445 25.4365 7.31737 25.6C6.86002 25.8005 6.47 26.1284 6.19387 26.5445C5.91773 26.9606 5.76713 27.4473 5.76004 27.9467V28.5227C5.77682 29.1245 5.99678 29.703 6.38413 30.1639C6.77147 30.6248 7.30341 30.9411 7.89337 31.0613C7.12021 31.5437 6.48062 32.2126 6.03332 33.0065C5.58602 33.8005 5.34533 34.6941 5.33337 35.6053V36.8213C5.37252 38.3039 5.99486 39.7112 7.06528 40.7376C8.13571 41.7641 9.56782 42.327 11.0507 42.304V44.5867C11.0507 44.8922 11.1721 45.1852 11.3881 45.4012C11.6042 45.6173 11.8972 45.7387 12.2027 45.7387C12.5082 45.7387 12.8013 45.6173 13.0173 45.4012C13.2333 45.1852 13.3547 44.8922 13.3547 44.5867V42.304C14.8139 42.2881 16.2104 41.7087 17.2521 40.6868C18.2938 39.665 18.9001 38.2799 18.944 36.8213V35.6053C18.9311 34.6865 18.6857 33.7859 18.2305 32.9875C17.7754 32.1892 17.1255 31.5192 16.3414 31.04C16.9296 30.9163 17.4594 30.599 17.8462 30.1388C18.2329 29.6786 18.4542 29.1021 18.4747 28.5013V27.9253C18.481 27.508 18.3852 27.0954 18.1955 26.7236C18.0059 26.3518 17.7282 26.0319 17.3867 25.792C17.8626 25.3369 18.1516 24.7208 18.1974 24.064C18.2362 23.4453 18.0714 22.8308 17.728 22.3147C18.3564 21.8768 18.8157 21.2368 19.0294 20.5013C19.2178 19.8563 19.2154 19.1705 19.0223 18.5269C18.8292 17.8833 18.4537 17.3094 17.9414 16.8747C18.3819 16.7923 18.8066 16.6412 19.2 16.4267C19.5965 16.866 20.0801 17.2181 20.62 17.4605C21.1598 17.7029 21.7443 17.8303 22.336 17.8347C22.972 17.8553 23.605 17.7389 24.192 17.4933V17.9413C24.2414 18.6996 24.582 19.4094 25.1426 19.9223C25.7032 20.4352 26.4404 20.7114 27.2 20.6933C27.8242 20.7322 28.4463 20.5897 28.9913 20.2832C29.5364 19.9766 29.9811 19.5189 30.272 18.9653C30.3215 19.7407 30.6734 20.4656 31.2519 20.9842C31.8303 21.5029 32.5892 21.7738 33.3654 21.7387C34.0019 21.7736 34.6344 21.6177 35.1818 21.2908C35.7291 20.9639 36.1663 20.481 36.4374 19.904C36.7385 20.325 37.1354 20.6684 37.5953 20.9058C38.0553 21.1432 38.5651 21.2678 39.0827 21.2693C39.858 21.3485 40.6338 21.1236 41.2467 20.6421C41.8595 20.1606 42.2615 19.46 42.368 18.688V18.2827C42.6747 18.718 43.08 19.0744 43.551 19.3229C44.0219 19.5713 44.545 19.7047 45.0774 19.712C45.372 19.7094 45.6654 19.6736 45.952 19.6053C46.0721 19.7298 46.2085 19.8374 46.3574 19.9253C45.9362 20.1942 45.5876 20.5625 45.342 20.9977C45.0965 21.4329 44.9617 21.9218 44.9494 22.4213C44.9589 22.8636 45.0674 23.2982 45.2667 23.6932C45.466 24.0882 45.7512 24.4335 46.1014 24.704C45.8109 24.9793 45.5782 25.3097 45.417 25.676C45.2558 26.0424 45.1694 26.4372 45.1627 26.8373C45.1724 27.241 45.2645 27.6384 45.4332 28.0053C45.602 28.3721 45.8438 28.7006 46.144 28.9707C45.7486 29.3693 45.4357 29.8421 45.2234 30.362C45.0111 30.8818 44.9035 31.4385 44.9067 32C44.908 32.7552 45.1224 33.4946 45.5254 34.1333C44.6437 34.8245 44.0384 35.8082 43.8187 36.9067C43.8187 37.0347 43.8187 37.184 43.8187 37.312C43.6091 37.4538 43.4221 37.6264 43.264 37.824C42.9598 38.2352 42.7752 38.7225 42.7307 39.232C42.0729 39.4949 41.5084 39.948 41.1094 40.5333C40.5287 40.0382 39.8188 39.7189 39.0631 39.6131C38.3073 39.5073 37.537 39.6193 36.8427 39.936C36.2089 39.2973 35.4543 38.791 34.6229 38.4467C33.7915 38.1025 32.8999 37.927 32 37.9307H31.5734C30.7161 37.9137 29.8638 38.0658 29.0653 38.3783C28.2668 38.6907 27.5376 39.1575 26.9195 39.7518C26.3014 40.3461 25.8065 41.0564 25.4629 41.842C25.1194 42.6277 24.934 43.4733 24.9174 44.3307V44.736C24.9182 45.5674 25.0889 46.3899 25.4191 47.153C25.7493 47.916 26.2319 48.6035 26.8374 49.1733C26.4789 49.5559 26.2738 50.0572 26.2614 50.5813C26.2556 51.0958 26.4359 51.5951 26.7691 51.9871C27.1023 52.3791 27.566 52.6375 28.0747 52.7147C28.0747 52.7147 28.0747 52.8427 28.0747 52.928C28.0815 53.3371 28.2058 53.7356 28.4327 54.076C28.6597 54.4164 28.9797 54.6844 29.3547 54.848V57.6C29.4098 58.1701 29.6751 58.6992 30.0991 59.0842C30.5231 59.4692 31.0753 59.6825 31.648 59.6825C32.2208 59.6825 32.773 59.4692 33.1969 59.0842C33.6209 58.6992 33.8863 58.1701 33.9414 57.6V54.5707C34.2398 54.3843 34.4875 54.1271 34.6624 53.8219C34.8374 53.5167 34.9341 53.173 34.944 52.8213C34.944 52.8213 34.944 52.8213 34.944 52.6933H35.4987C36.1605 52.6207 36.7781 52.326 37.2508 51.8572C37.7235 51.3883 38.0233 50.7731 38.1014 50.112C38.1014 49.3013 37.9947 49.2587 37.9947 49.2587C38.3145 49.6363 38.7187 49.9334 39.1745 50.1261C39.6303 50.3188 40.125 50.4017 40.6187 50.368C41.2217 50.3389 41.799 50.1153 42.2643 49.7308C42.7296 49.3462 43.0579 48.8213 43.2 48.2347C43.7546 48.8408 44.4723 49.2739 45.267 49.482C46.0617 49.6902 46.8996 49.6645 47.68 49.408C48.1581 49.2452 48.5957 48.982 48.9637 48.6361C49.3316 48.2903 49.6213 47.8697 49.8134 47.4027C50.3649 47.7789 51.0416 47.9248 51.6992 47.8092C52.3568 47.6937 52.9432 47.3258 53.3334 46.784C53.6126 46.3856 53.798 45.9291 53.8756 45.4487C53.9532 44.9684 53.921 44.4767 53.7814 44.0107C54.4653 43.73 55.0679 43.2822 55.5338 42.7082C55.9997 42.1342 56.3141 41.4524 56.448 40.7253C56.6315 39.9109 56.6189 39.0646 56.4112 38.256C56.2035 37.4474 55.8067 36.6998 55.2534 36.0747C56.1599 35.8407 56.9644 35.315 57.5426 34.5786C58.1209 33.8423 58.4409 32.9362 58.4534 32C58.4374 30.9951 58.0672 30.028 57.408 29.2693C57.7975 28.9996 58.1156 28.6392 58.3348 28.2193C58.5541 27.7994 58.668 27.3324 58.6667 26.8587Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_276">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-larynx.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-larynx.svg
index a5268d67e..946bfc80e 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-larynx.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-larynx.svg
@@ -1,13 +1,13 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_479)">
-<path d="M36.3514 48.4502C33.5455 48.4502 31.1267 47.3438 29.7915 45.7327C29.1335 46.5286 28.7272 47.4602 28.7272 48.4502C28.7272 51.4588 32.1329 53.9044 36.332 53.9044C40.5312 53.9044 43.9369 51.4588 43.9369 48.4502C43.9369 47.4602 43.5305 46.5286 42.8726 45.7327C41.5568 47.3632 39.1379 48.4502 36.3127 48.4502H36.3514Z" fill="white"/>
-<path d="M41.6149 55.0691V55.1079C41.6149 55.5543 39.3315 56.5442 35.558 56.5442C32.4813 56.5442 30.6429 55.8066 30.6429 55.0108C30.5849 54.4091 30.4881 53.4968 30.4301 52.4681C29.7915 51.9634 29.269 51.4005 28.9014 50.76C28.9594 52.8757 29.1529 54.7391 29.1916 55.1079C29.1916 56.913 31.5718 58 35.558 58C38.1511 58 43.0468 57.3983 43.0662 55.1273C43.1242 53.788 43.1629 52.6234 43.1823 51.5946C42.7759 52.0799 42.2728 52.5069 41.6923 52.8757C41.6923 53.6133 41.6536 54.3509 41.6149 55.0885V55.0691Z" fill="white"/>
-<path d="M32.9264 20.6159C33.9133 21.1594 35.4613 21.0235 35.4613 21.0235C35.4613 21.0235 37.0094 21.1594 37.9963 20.6159C39.4863 19.8007 41.8664 16.5009 42.1954 14.0164C42.447 12.1725 41.5375 9.64912 40.0668 7.99925C38.6155 6.34938 37.1255 6.01941 35.7322 6.01941C34.339 6.01941 32.191 6.42702 30.8171 7.99925C29.3658 9.64912 28.4563 12.1919 28.6885 14.0164C29.0175 16.5009 31.3977 19.8007 32.8877 20.6159H32.9264Z" fill="white"/>
-<path d="M50.7872 20.7906C50.6324 19.8395 50.4582 18.6555 50.5937 18.0537C50.9033 16.7339 51.2903 13.7059 50.4969 12.7353C50.0712 12.2113 49.4713 11.9783 48.9488 12.1725C48.5618 12.3083 48.2909 12.6383 48.2909 13.0265C48.2909 13.1818 48.2909 13.4729 48.3103 13.8223C48.349 14.424 48.3877 15.3169 48.3103 15.6857C48.1168 16.3845 47.9426 17.4909 47.8071 18.3837C47.7878 18.5584 47.7491 18.7137 47.7297 18.869C46.3171 17.5879 44.4014 16.6562 42.06 17.3356C41.0537 19.2184 39.583 20.9653 38.4414 21.5864C37.319 22.2075 35.6742 22.1105 35.4613 22.0911C35.4613 22.0911 35.2872 22.0911 35.0163 22.0911C34.4164 22.0911 33.3134 22.0134 32.5007 21.567C31.359 20.9459 29.8883 19.2184 28.8821 17.3162C26.5987 16.6368 24.7023 17.5297 23.2897 18.7719C23.251 18.539 23.2123 18.2673 23.1542 17.9761C23.0188 17.0832 22.8446 15.9769 22.6511 15.2781C22.593 15.084 22.6511 14.6375 22.7091 14.2688C22.7865 13.5894 22.8833 12.8712 22.6124 12.4054C22.3415 11.9589 22.0125 11.726 21.6448 11.6872C21.2191 11.6484 20.8515 11.8813 20.4838 12.3471C19.7098 13.2982 20.0194 16.1127 20.387 17.6655C20.5612 18.4225 20.5031 19.4901 20.4451 20.5965C20.4064 21.1982 20.387 21.7999 20.387 22.3822V22.8675H20.4064C20.4064 22.8675 20.4064 22.9257 20.4064 22.9451C20.1355 25.4879 22.8059 33.5431 23.9089 35.1542C24.9151 36.6099 26.0762 35.9306 27.1018 35.3483C27.3727 35.193 27.6823 35.0183 27.9919 34.863C28.05 34.766 28.0693 34.6883 28.1274 34.5719C29.1143 32.3979 32.4426 34.3583 32.8296 34.533L33.7198 34.9601C33.7198 34.9601 33.6036 35.0571 33.5456 35.1153L33.4101 35.1736C33.4101 35.1736 33.4295 35.1736 33.4488 35.193C32.9264 35.6976 32.133 36.6682 31.3396 38.4927C30.9913 37.7163 30.9913 36.9787 31.03 36.5517C31.1074 35.5812 32.6168 34.9601 32.6168 34.9601C32.6168 34.9601 29.3271 33.3684 28.5531 34.7854C27.7791 36.2023 28.108 36.6293 27.4114 36.9205C26.7148 37.2116 25.2828 37.7163 25.2828 38.5121C25.2828 39.3079 26.0955 43.3064 28.108 44.1023C28.5724 44.2964 29.0562 44.2576 29.5787 44.277C29.5787 44.3158 29.5787 44.3546 29.5593 44.3934C29.3852 44.7622 29.2497 45.2281 29.153 45.7521C29.2497 45.6163 29.3271 45.4804 29.4239 45.3639L29.7915 44.9175L30.1592 45.3639C30.2947 45.5192 30.4688 45.6357 30.6043 45.7715C30.6817 45.4416 30.7591 45.1698 30.8752 44.9563C30.9139 44.8981 30.9332 44.8399 30.9332 44.7816C30.9332 44.7622 30.9332 44.7428 30.9332 44.7234C31.8427 45.3251 31.804 46.0627 35.442 46.0627C39.2541 46.0627 39.0025 45.2669 40.0668 44.6458C40.3571 44.4711 40.628 44.3934 40.8989 44.3352C41.0537 44.6458 41.2085 44.9563 41.402 45.2863C41.4794 45.4222 41.5375 45.791 41.5762 46.2374C41.9051 45.9657 42.2341 45.7133 42.4857 45.3833L42.8146 44.9757C42.7179 44.6458 42.6211 44.4711 42.5437 44.374C42.505 44.2964 42.4857 44.2381 42.447 44.1605C42.5631 44.1411 42.6792 44.1217 42.8146 44.0829C44.8078 43.287 45.6399 39.2885 45.6399 38.4927C45.6399 37.6969 44.2272 37.2116 43.5113 36.9011C42.7953 36.5905 43.1242 36.1829 42.3696 34.766C41.6149 33.349 38.3059 34.9406 38.3059 34.9406C38.3059 34.9406 39.7959 35.5424 39.8927 36.5323C39.9314 36.9011 39.9507 37.4834 39.7379 38.1239C39.1186 36.7846 38.4414 35.6782 37.4351 34.8242L38.093 34.4942C38.4801 34.3195 41.6923 32.5144 42.6405 34.3001C42.6985 34.3972 42.8727 34.7077 42.9114 34.8048C43.2404 34.9601 43.5693 35.1347 43.8596 35.3094C44.8852 35.9112 46.0269 36.5711 47.0331 35.1153C47.8845 33.8925 49.6261 28.9235 50.284 25.5073C50.5163 25.0608 50.7098 24.3038 50.9226 22.9451L50.9613 22.7704C51.0387 22.3046 50.9226 21.567 50.7872 20.7324V20.7906ZM38.809 39.6573C38.1511 40.2979 37.1255 40.8608 35.4807 41.2101H35.442C33.9713 40.8996 33.0231 40.4143 32.3652 39.8514C33.2553 37.5804 34.1261 36.5905 34.5518 36.2023C34.7647 36.4352 34.9969 36.5517 35.1904 36.5711C35.2485 36.5711 35.2872 36.5711 35.3452 36.5711C35.7322 36.5711 36.1193 36.3576 36.4869 35.9694C37.4932 36.8234 38.1317 38.0463 38.809 39.6573Z" fill="white"/>
+<path d="M36.3514 48.4502C33.5455 48.4502 31.1267 47.3438 29.7915 45.7327C29.1335 46.5286 28.7272 47.4602 28.7272 48.4502C28.7272 51.4588 32.1329 53.9044 36.332 53.9044C40.5312 53.9044 43.9369 51.4588 43.9369 48.4502C43.9369 47.4602 43.5305 46.5286 42.8726 45.7327C41.5568 47.3632 39.1379 48.4502 36.3127 48.4502H36.3514Z" />
+<path d="M41.6149 55.0691V55.1079C41.6149 55.5543 39.3315 56.5442 35.558 56.5442C32.4813 56.5442 30.6429 55.8066 30.6429 55.0108C30.5849 54.4091 30.4881 53.4968 30.4301 52.4681C29.7915 51.9634 29.269 51.4005 28.9014 50.76C28.9594 52.8757 29.1529 54.7391 29.1916 55.1079C29.1916 56.913 31.5718 58 35.558 58C38.1511 58 43.0468 57.3983 43.0662 55.1273C43.1242 53.788 43.1629 52.6234 43.1823 51.5946C42.7759 52.0799 42.2728 52.5069 41.6923 52.8757C41.6923 53.6133 41.6536 54.3509 41.6149 55.0885V55.0691Z" />
+<path d="M32.9264 20.6159C33.9133 21.1594 35.4613 21.0235 35.4613 21.0235C35.4613 21.0235 37.0094 21.1594 37.9963 20.6159C39.4863 19.8007 41.8664 16.5009 42.1954 14.0164C42.447 12.1725 41.5375 9.64912 40.0668 7.99925C38.6155 6.34938 37.1255 6.01941 35.7322 6.01941C34.339 6.01941 32.191 6.42702 30.8171 7.99925C29.3658 9.64912 28.4563 12.1919 28.6885 14.0164C29.0175 16.5009 31.3977 19.8007 32.8877 20.6159H32.9264Z" />
+<path d="M50.7872 20.7906C50.6324 19.8395 50.4582 18.6555 50.5937 18.0537C50.9033 16.7339 51.2903 13.7059 50.4969 12.7353C50.0712 12.2113 49.4713 11.9783 48.9488 12.1725C48.5618 12.3083 48.2909 12.6383 48.2909 13.0265C48.2909 13.1818 48.2909 13.4729 48.3103 13.8223C48.349 14.424 48.3877 15.3169 48.3103 15.6857C48.1168 16.3845 47.9426 17.4909 47.8071 18.3837C47.7878 18.5584 47.7491 18.7137 47.7297 18.869C46.3171 17.5879 44.4014 16.6562 42.06 17.3356C41.0537 19.2184 39.583 20.9653 38.4414 21.5864C37.319 22.2075 35.6742 22.1105 35.4613 22.0911C35.4613 22.0911 35.2872 22.0911 35.0163 22.0911C34.4164 22.0911 33.3134 22.0134 32.5007 21.567C31.359 20.9459 29.8883 19.2184 28.8821 17.3162C26.5987 16.6368 24.7023 17.5297 23.2897 18.7719C23.251 18.539 23.2123 18.2673 23.1542 17.9761C23.0188 17.0832 22.8446 15.9769 22.6511 15.2781C22.593 15.084 22.6511 14.6375 22.7091 14.2688C22.7865 13.5894 22.8833 12.8712 22.6124 12.4054C22.3415 11.9589 22.0125 11.726 21.6448 11.6872C21.2191 11.6484 20.8515 11.8813 20.4838 12.3471C19.7098 13.2982 20.0194 16.1127 20.387 17.6655C20.5612 18.4225 20.5031 19.4901 20.4451 20.5965C20.4064 21.1982 20.387 21.7999 20.387 22.3822V22.8675H20.4064C20.4064 22.8675 20.4064 22.9257 20.4064 22.9451C20.1355 25.4879 22.8059 33.5431 23.9089 35.1542C24.9151 36.6099 26.0762 35.9306 27.1018 35.3483C27.3727 35.193 27.6823 35.0183 27.9919 34.863C28.05 34.766 28.0693 34.6883 28.1274 34.5719C29.1143 32.3979 32.4426 34.3583 32.8296 34.533L33.7198 34.9601C33.7198 34.9601 33.6036 35.0571 33.5456 35.1153L33.4101 35.1736C33.4101 35.1736 33.4295 35.1736 33.4488 35.193C32.9264 35.6976 32.133 36.6682 31.3396 38.4927C30.9913 37.7163 30.9913 36.9787 31.03 36.5517C31.1074 35.5812 32.6168 34.9601 32.6168 34.9601C32.6168 34.9601 29.3271 33.3684 28.5531 34.7854C27.7791 36.2023 28.108 36.6293 27.4114 36.9205C26.7148 37.2116 25.2828 37.7163 25.2828 38.5121C25.2828 39.3079 26.0955 43.3064 28.108 44.1023C28.5724 44.2964 29.0562 44.2576 29.5787 44.277C29.5787 44.3158 29.5787 44.3546 29.5593 44.3934C29.3852 44.7622 29.2497 45.2281 29.153 45.7521C29.2497 45.6163 29.3271 45.4804 29.4239 45.3639L29.7915 44.9175L30.1592 45.3639C30.2947 45.5192 30.4688 45.6357 30.6043 45.7715C30.6817 45.4416 30.7591 45.1698 30.8752 44.9563C30.9139 44.8981 30.9332 44.8399 30.9332 44.7816C30.9332 44.7622 30.9332 44.7428 30.9332 44.7234C31.8427 45.3251 31.804 46.0627 35.442 46.0627C39.2541 46.0627 39.0025 45.2669 40.0668 44.6458C40.3571 44.4711 40.628 44.3934 40.8989 44.3352C41.0537 44.6458 41.2085 44.9563 41.402 45.2863C41.4794 45.4222 41.5375 45.791 41.5762 46.2374C41.9051 45.9657 42.2341 45.7133 42.4857 45.3833L42.8146 44.9757C42.7179 44.6458 42.6211 44.4711 42.5437 44.374C42.505 44.2964 42.4857 44.2381 42.447 44.1605C42.5631 44.1411 42.6792 44.1217 42.8146 44.0829C44.8078 43.287 45.6399 39.2885 45.6399 38.4927C45.6399 37.6969 44.2272 37.2116 43.5113 36.9011C42.7953 36.5905 43.1242 36.1829 42.3696 34.766C41.6149 33.349 38.3059 34.9406 38.3059 34.9406C38.3059 34.9406 39.7959 35.5424 39.8927 36.5323C39.9314 36.9011 39.9507 37.4834 39.7379 38.1239C39.1186 36.7846 38.4414 35.6782 37.4351 34.8242L38.093 34.4942C38.4801 34.3195 41.6923 32.5144 42.6405 34.3001C42.6985 34.3972 42.8727 34.7077 42.9114 34.8048C43.2404 34.9601 43.5693 35.1347 43.8596 35.3094C44.8852 35.9112 46.0269 36.5711 47.0331 35.1153C47.8845 33.8925 49.6261 28.9235 50.284 25.5073C50.5163 25.0608 50.7098 24.3038 50.9226 22.9451L50.9613 22.7704C51.0387 22.3046 50.9226 21.567 50.7872 20.7324V20.7906ZM38.809 39.6573C38.1511 40.2979 37.1255 40.8608 35.4807 41.2101H35.442C33.9713 40.8996 33.0231 40.4143 32.3652 39.8514C33.2553 37.5804 34.1261 36.5905 34.5518 36.2023C34.7647 36.4352 34.9969 36.5517 35.1904 36.5711C35.2485 36.5711 35.2872 36.5711 35.3452 36.5711C35.7322 36.5711 36.1193 36.3576 36.4869 35.9694C37.4932 36.8234 38.1317 38.0463 38.809 39.6573Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_479">
-<rect width="31" height="52" fill="white" transform="translate(20 6)"/>
+<rect width="31" height="52"  transform="translate(20 6)"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-liver.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-liver.svg
index 115810375..515ad47dd 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-liver.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-liver.svg
@@ -1,11 +1,11 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_280)">
-<path d="M35.7333 17.8987C33.1667 18.3339 30.7892 19.5275 28.9072 21.326C27.0251 23.1244 25.7246 25.4452 25.1733 27.9893C23.9359 32.768 25.1733 34.3893 23.9359 39.68C22.6986 44.9707 16.2559 42.6667 14.2293 45.4613C12.2026 48.256 12.6079 51.6267 9.32261 50.7307C6.03727 49.8347 3.13594 36.928 4.69327 30.6347C6.25061 24.3413 8.53327 20.9067 14.5919 18.1547C20.6506 15.4027 35.7333 17.8987 35.7333 17.8987Z" fill="white"/>
-<path d="M59.7334 21.3333C59.7334 18.1973 46.5281 17.3013 42.1761 17.3013C37.8241 17.3013 29.8454 18.4533 27.2427 26.5387C24.6401 34.624 28.1814 41.1307 31.2534 40.576C34.3254 40.0213 35.6481 36.0533 38.6774 35.84C42.5535 35.1901 46.2139 33.6088 49.3441 31.232C52.6294 28.9493 59.7334 24.512 59.7334 21.3333Z" fill="white"/>
+<path d="M35.7333 17.8987C33.1667 18.3339 30.7892 19.5275 28.9072 21.326C27.0251 23.1244 25.7246 25.4452 25.1733 27.9893C23.9359 32.768 25.1733 34.3893 23.9359 39.68C22.6986 44.9707 16.2559 42.6667 14.2293 45.4613C12.2026 48.256 12.6079 51.6267 9.32261 50.7307C6.03727 49.8347 3.13594 36.928 4.69327 30.6347C6.25061 24.3413 8.53327 20.9067 14.5919 18.1547C20.6506 15.4027 35.7333 17.8987 35.7333 17.8987Z" />
+<path d="M59.7334 21.3333C59.7334 18.1973 46.5281 17.3013 42.1761 17.3013C37.8241 17.3013 29.8454 18.4533 27.2427 26.5387C24.6401 34.624 28.1814 41.1307 31.2534 40.576C34.3254 40.0213 35.6481 36.0533 38.6774 35.84C42.5535 35.1901 46.2139 33.6088 49.3441 31.232C52.6294 28.9493 59.7334 24.512 59.7334 21.3333Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_280">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-lung-left.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-lung-left.svg
index 3f9f73e30..035a48a9a 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-lung-left.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-lung-left.svg
@@ -1,11 +1,11 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_285)">
-<path d="M36.48 15.7653C36.5037 15.1393 36.6873 14.5297 37.0133 13.9947C37.2499 13.5745 37.5987 13.2283 38.0206 12.9948C38.4425 12.7612 38.9209 12.6495 39.4026 12.672C40.287 12.6904 41.1411 12.9975 41.8346 13.5467C42.3953 13.9758 42.9164 14.4542 43.392 14.976C45.3474 16.9317 47.1053 19.0754 48.64 21.376C50.523 24.2204 52.1916 27.2011 53.632 30.2933C55.3849 34.1022 56.5639 38.1496 57.1306 42.304C58.112 49.3867 57.5573 53.44 55.5306 54.4853C52.9066 55.8507 42.624 54.9333 37.8666 51.7547C37.3183 51.3895 36.9116 50.8474 36.7146 50.2187C36.5809 49.7312 36.5021 49.2303 36.48 48.7253V15.7653Z" fill="white"/>
-<path d="M34.1334 22.272C32.8986 21.8621 31.8232 21.076 31.058 20.0238C30.2928 18.9716 29.8762 17.7063 29.8667 16.4053V6.54935H25.6V16.4053C25.595 17.71 25.1805 18.9801 24.415 20.0365C23.6494 21.0929 22.5716 21.8823 21.3334 22.2933V25.8347H34.1334V22.272Z" fill="white"/>
+<path d="M36.48 15.7653C36.5037 15.1393 36.6873 14.5297 37.0133 13.9947C37.2499 13.5745 37.5987 13.2283 38.0206 12.9948C38.4425 12.7612 38.9209 12.6495 39.4026 12.672C40.287 12.6904 41.1411 12.9975 41.8346 13.5467C42.3953 13.9758 42.9164 14.4542 43.392 14.976C45.3474 16.9317 47.1053 19.0754 48.64 21.376C50.523 24.2204 52.1916 27.2011 53.632 30.2933C55.3849 34.1022 56.5639 38.1496 57.1306 42.304C58.112 49.3867 57.5573 53.44 55.5306 54.4853C52.9066 55.8507 42.624 54.9333 37.8666 51.7547C37.3183 51.3895 36.9116 50.8474 36.7146 50.2187C36.5809 49.7312 36.5021 49.2303 36.48 48.7253V15.7653Z" />
+<path d="M34.1334 22.272C32.8986 21.8621 31.8232 21.076 31.058 20.0238C30.2928 18.9716 29.8762 17.7063 29.8667 16.4053V6.54935H25.6V16.4053C25.595 17.71 25.1805 18.9801 24.415 20.0365C23.6494 21.0929 22.5716 21.8823 21.3334 22.2933V25.8347H34.1334V22.272Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_285">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-lung-right.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-lung-right.svg
index 7ad528995..abe2833da 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-lung-right.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-lung-right.svg
@@ -1,11 +1,11 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_290)">
-<path d="M27.5413 15.7653C27.5814 15.3637 27.5348 14.9582 27.4045 14.5763C27.2742 14.1943 27.0633 13.8448 26.7862 13.5515C26.509 13.2581 26.172 13.0278 25.798 12.876C25.4241 12.7243 25.0219 12.6547 24.6187 12.672C23.7343 12.6904 22.8802 12.9975 22.1867 13.5467C21.6279 13.9623 21.1067 14.4263 20.6293 14.9333C18.6739 16.889 16.916 19.0327 15.3813 21.3333C13.4964 24.1915 11.8278 27.1865 10.3893 30.2933C8.62681 34.0986 7.44736 38.1475 6.89066 42.304C5.90933 49.3867 6.464 53.44 8.49066 54.4853C11.1147 55.8507 21.2907 54.9333 26.1547 51.7547C26.7031 51.3895 27.1097 50.8473 27.3067 50.2187C27.4404 49.7312 27.5192 49.2303 27.5413 48.7253C27.5413 48.7253 27.5413 38.6987 27.5413 30.9973C27.5413 23.296 27.5413 16.064 27.5413 15.7653Z" fill="white"/>
-<path d="M42.6667 22.272C41.432 21.8621 40.3565 21.076 39.5913 20.0238C38.8261 18.9716 38.4095 17.7063 38.4 16.4053V6.54935H34.1334V16.4053C34.1283 17.71 33.7138 18.9801 32.9483 20.0365C32.1828 21.0929 31.1049 21.8823 29.8667 22.2933V25.8347H42.6667V22.272Z" fill="white"/>
+<path d="M27.5413 15.7653C27.5814 15.3637 27.5348 14.9582 27.4045 14.5763C27.2742 14.1943 27.0633 13.8448 26.7862 13.5515C26.509 13.2581 26.172 13.0278 25.798 12.876C25.4241 12.7243 25.0219 12.6547 24.6187 12.672C23.7343 12.6904 22.8802 12.9975 22.1867 13.5467C21.6279 13.9623 21.1067 14.4263 20.6293 14.9333C18.6739 16.889 16.916 19.0327 15.3813 21.3333C13.4964 24.1915 11.8278 27.1865 10.3893 30.2933C8.62681 34.0986 7.44736 38.1475 6.89066 42.304C5.90933 49.3867 6.464 53.44 8.49066 54.4853C11.1147 55.8507 21.2907 54.9333 26.1547 51.7547C26.7031 51.3895 27.1097 50.8473 27.3067 50.2187C27.4404 49.7312 27.5192 49.2303 27.5413 48.7253C27.5413 48.7253 27.5413 38.6987 27.5413 30.9973C27.5413 23.296 27.5413 16.064 27.5413 15.7653Z" />
+<path d="M42.6667 22.272C41.432 21.8621 40.3565 21.076 39.5913 20.0238C38.8261 18.9716 38.4095 17.7063 38.4 16.4053V6.54935H34.1334V16.4053C34.1283 17.71 33.7138 18.9801 32.9483 20.0365C32.1828 21.0929 31.1049 21.8823 29.8667 22.2933V25.8347H42.6667V22.272Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_290">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-lungs.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-lungs.svg
index 2acbef6e3..d1e6cf4a8 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-lungs.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-lungs.svg
@@ -1,12 +1,12 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_295)">
-<path d="M23.2746 15.7653C23.3147 15.3638 23.268 14.9582 23.1377 14.5763C23.0075 14.1943 22.7966 13.8448 22.5194 13.5515C22.2423 13.2581 21.9053 13.0278 21.5313 12.876C21.1573 12.7243 20.7551 12.6547 20.3519 12.672C19.4675 12.6904 18.6134 12.9975 17.9199 13.5467C17.3611 13.9623 16.84 14.4263 16.3626 14.9333C14.4072 16.889 12.6493 19.0327 11.1146 21.3333C9.2297 24.1915 7.56105 27.1865 6.12259 30.2933C4.36007 34.0986 3.18063 38.1475 2.62393 42.304C1.64259 49.3867 2.13326 53.44 4.26659 54.4853C6.89059 55.8507 17.0666 54.9333 21.9306 51.7547C22.479 51.3895 22.8856 50.8474 23.0826 50.2187C23.2164 49.7312 23.2951 49.2303 23.3173 48.7253C23.3173 48.7253 23.3173 38.6987 23.3173 30.9973C23.3173 23.296 23.2746 16.064 23.2746 15.7653Z" fill="white"/>
-<path d="M40.7466 15.7653C40.7703 15.1393 40.9539 14.5297 41.2799 13.9947C41.5165 13.5745 41.8653 13.2283 42.2872 12.9948C42.7091 12.7612 43.1875 12.6495 43.6692 12.672C44.5536 12.6904 45.4077 12.9975 46.1012 13.5467C46.6619 13.9758 47.183 14.4542 47.6586 14.976C49.614 16.9317 51.3719 19.0754 52.9066 21.376C54.7896 24.2204 56.4582 27.2011 57.8986 30.2933C59.6515 34.1022 60.8305 38.1496 61.3972 42.304C62.3786 49.3867 61.8239 53.44 59.7972 54.4853C57.1732 55.8507 46.8906 54.9333 42.1332 51.7547C41.5849 51.3895 41.1783 50.8474 40.9812 50.2187C40.8475 49.7312 40.7687 49.2303 40.7466 48.7253V15.7653Z" fill="white"/>
-<path d="M38.4001 22.272C37.1654 21.8621 36.0899 21.076 35.3247 20.0238C34.5595 18.9716 34.1429 17.7063 34.1334 16.4053V6.54935H29.8668V16.4053C29.8617 17.71 29.4472 18.9801 28.6817 20.0365C27.9162 21.0929 26.8383 21.8823 25.6001 22.2933V25.8347H38.4001V22.272Z" fill="white"/>
+<path d="M23.2746 15.7653C23.3147 15.3638 23.268 14.9582 23.1377 14.5763C23.0075 14.1943 22.7966 13.8448 22.5194 13.5515C22.2423 13.2581 21.9053 13.0278 21.5313 12.876C21.1573 12.7243 20.7551 12.6547 20.3519 12.672C19.4675 12.6904 18.6134 12.9975 17.9199 13.5467C17.3611 13.9623 16.84 14.4263 16.3626 14.9333C14.4072 16.889 12.6493 19.0327 11.1146 21.3333C9.2297 24.1915 7.56105 27.1865 6.12259 30.2933C4.36007 34.0986 3.18063 38.1475 2.62393 42.304C1.64259 49.3867 2.13326 53.44 4.26659 54.4853C6.89059 55.8507 17.0666 54.9333 21.9306 51.7547C22.479 51.3895 22.8856 50.8474 23.0826 50.2187C23.2164 49.7312 23.2951 49.2303 23.3173 48.7253C23.3173 48.7253 23.3173 38.6987 23.3173 30.9973C23.3173 23.296 23.2746 16.064 23.2746 15.7653Z" />
+<path d="M40.7466 15.7653C40.7703 15.1393 40.9539 14.5297 41.2799 13.9947C41.5165 13.5745 41.8653 13.2283 42.2872 12.9948C42.7091 12.7612 43.1875 12.6495 43.6692 12.672C44.5536 12.6904 45.4077 12.9975 46.1012 13.5467C46.6619 13.9758 47.183 14.4542 47.6586 14.976C49.614 16.9317 51.3719 19.0754 52.9066 21.376C54.7896 24.2204 56.4582 27.2011 57.8986 30.2933C59.6515 34.1022 60.8305 38.1496 61.3972 42.304C62.3786 49.3867 61.8239 53.44 59.7972 54.4853C57.1732 55.8507 46.8906 54.9333 42.1332 51.7547C41.5849 51.3895 41.1783 50.8474 40.9812 50.2187C40.8475 49.7312 40.7687 49.2303 40.7466 48.7253V15.7653Z" />
+<path d="M38.4001 22.272C37.1654 21.8621 36.0899 21.076 35.3247 20.0238C34.5595 18.9716 34.1429 17.7063 34.1334 16.4053V6.54935H29.8668V16.4053C29.8617 17.71 29.4472 18.9801 28.6817 20.0365C27.9162 21.0929 26.8383 21.8823 25.6001 22.2933V25.8347H38.4001V22.272Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_295">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-lymph-nodes.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-lymph-nodes.svg
index 7840841cd..23c392f8f 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-lymph-nodes.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-lymph-nodes.svg
@@ -1,10 +1,10 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_301)">
-<path d="M50.7308 31.2533C50.9228 30.784 46.3148 28.3733 44.2028 29.5253C42.0908 30.6773 39.3814 32 37.9308 32.6187L38.5281 30.4853C39.132 30.282 39.6597 29.8995 40.0408 29.3888C40.4219 28.8781 40.6384 28.2635 40.6614 27.6267C40.8961 25.9627 40.2348 24.4907 39.1468 24.2133L39.0188 21.7813C39.8651 20.8901 40.8437 20.1346 41.9201 19.5413C42.9014 18.9867 44.3094 18.7093 45.4401 18.176C46.4274 17.6166 47.2891 16.8601 47.9717 15.9537C48.6543 15.0472 49.1432 14.01 49.4081 12.9067C49.0668 12.8 47.6801 16.192 44.9921 17.3653C43.8614 17.8773 42.4321 18.1333 41.4508 18.688C40.5327 19.2003 39.6863 19.8315 38.9334 20.5653V19.4773C39.4407 19.2079 39.8712 18.814 40.1847 18.3326C40.4981 17.8513 40.6842 17.2982 40.7254 16.7253C40.8004 16.259 40.8004 15.7837 40.7254 15.3173C40.9643 13.6814 41.3136 12.0635 41.7708 10.4747C42.5294 8.66716 43.129 6.79697 43.5628 4.88532C42.2446 6.40145 41.3019 8.20658 40.8108 10.1547C40.4393 11.3124 40.154 12.4961 39.9574 13.696C39.721 13.4574 39.4146 13.3005 39.0828 13.248C38.6925 13.2152 38.3024 13.3127 37.9734 13.5253C37.8028 10.6667 37.2694 3.56265 36.7361 3.56265C36.2028 3.56265 36.6294 9.21599 36.8641 12.5013C35.3494 9.62132 32.5974 4.58665 32.1921 4.77865C31.7868 4.97065 36.2668 13.568 36.8428 14.784C36.6321 15.2056 36.495 15.6602 36.4374 16.128C36.3115 16.7061 36.3419 17.3074 36.5257 17.8699C36.7094 18.4324 37.0398 18.9357 37.4828 19.328L37.8028 24.5547C37.6718 24.6572 37.5504 24.7715 37.4401 24.896C36.4588 23.2747 34.3468 19.6693 32.5334 15.9573C31.1254 13.12 24.7254 10.6667 24.5974 11.136C24.4694 11.6053 30.4854 13.6747 31.7441 16.5333C31.9788 17.0667 32.2134 17.6 32.4694 18.1333C31.4476 17.5161 30.36 17.0152 29.2268 16.64C27.263 15.9239 25.1576 15.6827 23.0828 15.936C22.9548 16.256 26.2188 16.64 28.9281 17.6C30.4874 18.1695 31.9706 18.929 33.3441 19.8613C34.7948 22.6773 36.2241 24.9387 36.8001 25.8347C36.6191 26.2345 36.4969 26.6585 36.4374 27.0933C36.3459 27.5931 36.3573 28.1063 36.471 28.6015C36.5847 29.0968 36.7983 29.5635 37.0988 29.9733L35.9681 33.8987C35.5907 34.0163 35.241 34.2093 34.9404 34.466C34.6397 34.7227 34.3942 35.0377 34.2188 35.392L31.6161 34.1333C31.6161 33.088 30.5708 31.6587 28.7788 30.656C27.7131 30.0151 26.479 29.7103 25.2374 29.7813C24.7439 27.7388 23.976 25.7725 22.9548 23.936C22.1308 22.4119 20.8039 21.2207 19.2001 20.5653C18.9228 20.6933 20.8001 22.0587 22.0374 24.2773C22.4628 25.0467 22.8335 25.8452 23.1468 26.6667C22.9493 26.4446 22.7354 26.2378 22.5068 26.048C21.0938 24.8667 19.3658 24.1251 17.5361 23.9147C17.2161 24.064 19.9681 25.0027 21.8028 26.688C22.8369 27.6973 23.6252 28.9309 24.1068 30.2933L24.0001 30.4213C23.9001 30.6274 23.8481 30.8535 23.8481 31.0827C23.8481 31.3118 23.9001 31.5379 24.0001 31.744C22.5221 31.9381 21.0319 32.0236 19.5414 32C15.9574 32 12.1601 31.168 12.1174 31.5093C14.4509 32.5296 16.9734 33.0458 19.5201 33.024C21.2409 33.0767 22.9627 32.9624 24.6614 32.6827C25.2551 33.3789 25.98 33.9516 26.7948 34.368C27.1909 34.5814 27.6049 34.7598 28.0321 34.9013L24.2561 37.9733H24.0214H23.7014C22.669 37.5467 21.5866 37.2528 20.4801 37.0987C18.8955 36.8002 17.2599 36.9328 15.7441 37.4827C15.7441 37.8453 18.1761 37.7813 20.3948 38.1227C21.0588 38.225 21.7147 38.3748 22.3574 38.5707C22.2771 38.6236 22.2052 38.6883 22.1441 38.7627C21.1818 39.0923 20.1982 39.356 19.2001 39.552C16.6828 39.9573 13.8241 39.9787 13.9094 40.3413C15.6573 40.849 17.5028 40.9223 19.2854 40.5547C20.3392 40.4115 21.3757 40.1613 22.3788 39.808C22.9347 40.0786 23.5571 40.1823 24.1708 40.1067C25.3441 39.9787 26.3041 39.3813 26.1761 38.8053C26.0481 38.2293 25.8774 38.2933 25.4934 38.144L29.0134 35.2C29.5269 35.3082 30.0573 35.3082 30.5708 35.2L33.7068 36.7573C33.5958 37.2042 33.5763 37.669 33.6497 38.1236C33.723 38.5782 33.8875 39.0133 34.1334 39.4027L32.3628 43.1787C31.7721 43.2148 31.2018 43.4079 30.7105 43.7379C30.2193 44.0679 29.8249 44.5229 29.5681 45.056C29.2692 45.5151 29.0809 46.0372 29.018 46.5813C28.9551 47.1255 29.0192 47.6768 29.2054 48.192L28.2881 49.4507H22.3361C21.8866 49.0624 21.3274 48.8238 20.7361 48.768H20.3308C19.2759 48.4112 18.1783 48.196 17.0668 48.128C15.4448 47.9867 13.8163 48.3124 12.3734 49.0667C12.3734 49.408 14.8054 49.0667 17.0454 49.2373L18.4961 49.408C18.4961 49.408 18.4961 49.408 18.4961 49.5573C18.4672 49.6693 18.4672 49.7867 18.4961 49.8987C17.8237 50.0881 17.1674 50.3307 16.5334 50.624C14.8335 51.2839 13.3185 52.3452 12.1174 53.7173C12.2454 54.0587 14.6774 52.544 17.0241 51.584C17.8201 51.2405 18.6401 50.9553 19.4774 50.7307C19.7747 50.844 20.0818 50.9296 20.3948 50.9867C21.0202 51.0991 21.6652 51.0016 22.2294 50.7093L27.3281 50.8587L26.3254 52.2027C25.2801 51.9893 24.0214 52.9067 23.4028 54.336C23.2073 54.818 23.099 55.3308 23.0828 55.8507C22.6529 56.0451 22.2392 56.2734 21.8454 56.5333C19.9894 57.6 18.2828 59.456 18.4321 59.7333C18.5814 60.0107 20.5654 58.4107 22.4001 57.2373L23.2108 56.7893C23.2651 57.0415 23.3758 57.2781 23.5347 57.4813C23.6936 57.6846 23.8965 57.8491 24.1281 57.9627C24.2829 57.9949 24.4426 57.9949 24.5974 57.9627C24.6002 58.0124 24.6002 58.0622 24.5974 58.112C24.2774 59.456 23.5094 60.864 23.8721 60.9067C24.2348 60.9493 25.1734 59.7333 25.6001 58.4533C25.6205 58.2476 25.6205 58.0404 25.6001 57.8347C26.3574 57.3834 26.9428 56.6929 27.2641 55.872C27.6275 55.0767 27.7102 54.1817 27.4988 53.3333L30.5708 49.0667H30.9548C31.6594 50.9152 32.0976 52.8547 32.2561 54.8267C32.2561 56.6187 32.4054 57.984 32.6401 58.0053C32.8748 58.0267 33.0454 56.5973 33.1521 54.7413C33.1032 52.651 32.6617 50.5885 31.8508 48.6613C32.4122 48.2968 32.8741 47.7983 33.1948 47.2107C33.5032 46.7558 33.6973 46.2331 33.7604 45.6871C33.8236 45.1411 33.7539 44.588 33.5574 44.0747L34.4961 42.0907L36.3948 44.6507C36.4013 44.9912 36.4854 45.3257 36.6407 45.6288C36.7959 45.932 37.0183 46.1957 37.2908 46.4C37.412 47.7484 37.9402 49.028 38.8054 50.0693C40.2598 51.6423 42.1824 52.7046 44.2881 53.0987C44.5868 52.8853 41.2801 51.4347 39.5094 49.3227C38.9854 48.6932 38.5871 47.969 38.3361 47.1893C38.9334 47.4453 39.4668 47.488 39.7228 47.1893C39.7993 47.0832 39.8437 46.9573 39.8508 46.8267C40.4268 47.104 41.0668 47.424 41.7068 47.808C43.8401 49.1307 46.1014 50.9653 46.2721 50.6453C46.4428 50.3253 44.4374 48.3413 42.3254 46.976C41.3659 46.388 40.3513 45.895 39.2961 45.504C39.1494 45.318 38.985 45.1465 38.8054 44.992C38.3644 44.5889 37.8161 44.3222 37.2268 44.224L34.9441 41.216L35.4348 40.1493C36.0363 40.0168 36.5864 39.7124 37.0182 39.2731C37.4499 38.8337 37.7448 38.2784 37.8668 37.6747C38.0766 37.1387 38.1475 36.5585 38.0729 35.9878C37.9983 35.4172 37.7806 34.8746 37.4401 34.4107L37.5681 33.9413C39.0242 33.3633 40.4484 32.7082 41.8348 31.9787C43.0376 32.2063 44.1922 32.6393 45.2481 33.2587C47.1468 34.3467 49.0668 36.2667 49.1521 35.9467C48.281 34.4616 47.048 33.2213 45.5681 32.3413C44.8041 31.873 43.9783 31.514 43.1148 31.2747C43.4988 31.04 43.8828 30.8267 44.2668 30.5707C46.4001 29.2053 50.4748 31.872 50.7308 31.2533Z" fill="white"/>
+<path d="M50.7308 31.2533C50.9228 30.784 46.3148 28.3733 44.2028 29.5253C42.0908 30.6773 39.3814 32 37.9308 32.6187L38.5281 30.4853C39.132 30.282 39.6597 29.8995 40.0408 29.3888C40.4219 28.8781 40.6384 28.2635 40.6614 27.6267C40.8961 25.9627 40.2348 24.4907 39.1468 24.2133L39.0188 21.7813C39.8651 20.8901 40.8437 20.1346 41.9201 19.5413C42.9014 18.9867 44.3094 18.7093 45.4401 18.176C46.4274 17.6166 47.2891 16.8601 47.9717 15.9537C48.6543 15.0472 49.1432 14.01 49.4081 12.9067C49.0668 12.8 47.6801 16.192 44.9921 17.3653C43.8614 17.8773 42.4321 18.1333 41.4508 18.688C40.5327 19.2003 39.6863 19.8315 38.9334 20.5653V19.4773C39.4407 19.2079 39.8712 18.814 40.1847 18.3326C40.4981 17.8513 40.6842 17.2982 40.7254 16.7253C40.8004 16.259 40.8004 15.7837 40.7254 15.3173C40.9643 13.6814 41.3136 12.0635 41.7708 10.4747C42.5294 8.66716 43.129 6.79697 43.5628 4.88532C42.2446 6.40145 41.3019 8.20658 40.8108 10.1547C40.4393 11.3124 40.154 12.4961 39.9574 13.696C39.721 13.4574 39.4146 13.3005 39.0828 13.248C38.6925 13.2152 38.3024 13.3127 37.9734 13.5253C37.8028 10.6667 37.2694 3.56265 36.7361 3.56265C36.2028 3.56265 36.6294 9.21599 36.8641 12.5013C35.3494 9.62132 32.5974 4.58665 32.1921 4.77865C31.7868 4.97065 36.2668 13.568 36.8428 14.784C36.6321 15.2056 36.495 15.6602 36.4374 16.128C36.3115 16.7061 36.3419 17.3074 36.5257 17.8699C36.7094 18.4324 37.0398 18.9357 37.4828 19.328L37.8028 24.5547C37.6718 24.6572 37.5504 24.7715 37.4401 24.896C36.4588 23.2747 34.3468 19.6693 32.5334 15.9573C31.1254 13.12 24.7254 10.6667 24.5974 11.136C24.4694 11.6053 30.4854 13.6747 31.7441 16.5333C31.9788 17.0667 32.2134 17.6 32.4694 18.1333C31.4476 17.5161 30.36 17.0152 29.2268 16.64C27.263 15.9239 25.1576 15.6827 23.0828 15.936C22.9548 16.256 26.2188 16.64 28.9281 17.6C30.4874 18.1695 31.9706 18.929 33.3441 19.8613C34.7948 22.6773 36.2241 24.9387 36.8001 25.8347C36.6191 26.2345 36.4969 26.6585 36.4374 27.0933C36.3459 27.5931 36.3573 28.1063 36.471 28.6015C36.5847 29.0968 36.7983 29.5635 37.0988 29.9733L35.9681 33.8987C35.5907 34.0163 35.241 34.2093 34.9404 34.466C34.6397 34.7227 34.3942 35.0377 34.2188 35.392L31.6161 34.1333C31.6161 33.088 30.5708 31.6587 28.7788 30.656C27.7131 30.0151 26.479 29.7103 25.2374 29.7813C24.7439 27.7388 23.976 25.7725 22.9548 23.936C22.1308 22.4119 20.8039 21.2207 19.2001 20.5653C18.9228 20.6933 20.8001 22.0587 22.0374 24.2773C22.4628 25.0467 22.8335 25.8452 23.1468 26.6667C22.9493 26.4446 22.7354 26.2378 22.5068 26.048C21.0938 24.8667 19.3658 24.1251 17.5361 23.9147C17.2161 24.064 19.9681 25.0027 21.8028 26.688C22.8369 27.6973 23.6252 28.9309 24.1068 30.2933L24.0001 30.4213C23.9001 30.6274 23.8481 30.8535 23.8481 31.0827C23.8481 31.3118 23.9001 31.5379 24.0001 31.744C22.5221 31.9381 21.0319 32.0236 19.5414 32C15.9574 32 12.1601 31.168 12.1174 31.5093C14.4509 32.5296 16.9734 33.0458 19.5201 33.024C21.2409 33.0767 22.9627 32.9624 24.6614 32.6827C25.2551 33.3789 25.98 33.9516 26.7948 34.368C27.1909 34.5814 27.6049 34.7598 28.0321 34.9013L24.2561 37.9733H24.0214H23.7014C22.669 37.5467 21.5866 37.2528 20.4801 37.0987C18.8955 36.8002 17.2599 36.9328 15.7441 37.4827C15.7441 37.8453 18.1761 37.7813 20.3948 38.1227C21.0588 38.225 21.7147 38.3748 22.3574 38.5707C22.2771 38.6236 22.2052 38.6883 22.1441 38.7627C21.1818 39.0923 20.1982 39.356 19.2001 39.552C16.6828 39.9573 13.8241 39.9787 13.9094 40.3413C15.6573 40.849 17.5028 40.9223 19.2854 40.5547C20.3392 40.4115 21.3757 40.1613 22.3788 39.808C22.9347 40.0786 23.5571 40.1823 24.1708 40.1067C25.3441 39.9787 26.3041 39.3813 26.1761 38.8053C26.0481 38.2293 25.8774 38.2933 25.4934 38.144L29.0134 35.2C29.5269 35.3082 30.0573 35.3082 30.5708 35.2L33.7068 36.7573C33.5958 37.2042 33.5763 37.669 33.6497 38.1236C33.723 38.5782 33.8875 39.0133 34.1334 39.4027L32.3628 43.1787C31.7721 43.2148 31.2018 43.4079 30.7105 43.7379C30.2193 44.0679 29.8249 44.5229 29.5681 45.056C29.2692 45.5151 29.0809 46.0372 29.018 46.5813C28.9551 47.1255 29.0192 47.6768 29.2054 48.192L28.2881 49.4507H22.3361C21.8866 49.0624 21.3274 48.8238 20.7361 48.768H20.3308C19.2759 48.4112 18.1783 48.196 17.0668 48.128C15.4448 47.9867 13.8163 48.3124 12.3734 49.0667C12.3734 49.408 14.8054 49.0667 17.0454 49.2373L18.4961 49.408C18.4961 49.408 18.4961 49.408 18.4961 49.5573C18.4672 49.6693 18.4672 49.7867 18.4961 49.8987C17.8237 50.0881 17.1674 50.3307 16.5334 50.624C14.8335 51.2839 13.3185 52.3452 12.1174 53.7173C12.2454 54.0587 14.6774 52.544 17.0241 51.584C17.8201 51.2405 18.6401 50.9553 19.4774 50.7307C19.7747 50.844 20.0818 50.9296 20.3948 50.9867C21.0202 51.0991 21.6652 51.0016 22.2294 50.7093L27.3281 50.8587L26.3254 52.2027C25.2801 51.9893 24.0214 52.9067 23.4028 54.336C23.2073 54.818 23.099 55.3308 23.0828 55.8507C22.6529 56.0451 22.2392 56.2734 21.8454 56.5333C19.9894 57.6 18.2828 59.456 18.4321 59.7333C18.5814 60.0107 20.5654 58.4107 22.4001 57.2373L23.2108 56.7893C23.2651 57.0415 23.3758 57.2781 23.5347 57.4813C23.6936 57.6846 23.8965 57.8491 24.1281 57.9627C24.2829 57.9949 24.4426 57.9949 24.5974 57.9627C24.6002 58.0124 24.6002 58.0622 24.5974 58.112C24.2774 59.456 23.5094 60.864 23.8721 60.9067C24.2348 60.9493 25.1734 59.7333 25.6001 58.4533C25.6205 58.2476 25.6205 58.0404 25.6001 57.8347C26.3574 57.3834 26.9428 56.6929 27.2641 55.872C27.6275 55.0767 27.7102 54.1817 27.4988 53.3333L30.5708 49.0667H30.9548C31.6594 50.9152 32.0976 52.8547 32.2561 54.8267C32.2561 56.6187 32.4054 57.984 32.6401 58.0053C32.8748 58.0267 33.0454 56.5973 33.1521 54.7413C33.1032 52.651 32.6617 50.5885 31.8508 48.6613C32.4122 48.2968 32.8741 47.7983 33.1948 47.2107C33.5032 46.7558 33.6973 46.2331 33.7604 45.6871C33.8236 45.1411 33.7539 44.588 33.5574 44.0747L34.4961 42.0907L36.3948 44.6507C36.4013 44.9912 36.4854 45.3257 36.6407 45.6288C36.7959 45.932 37.0183 46.1957 37.2908 46.4C37.412 47.7484 37.9402 49.028 38.8054 50.0693C40.2598 51.6423 42.1824 52.7046 44.2881 53.0987C44.5868 52.8853 41.2801 51.4347 39.5094 49.3227C38.9854 48.6932 38.5871 47.969 38.3361 47.1893C38.9334 47.4453 39.4668 47.488 39.7228 47.1893C39.7993 47.0832 39.8437 46.9573 39.8508 46.8267C40.4268 47.104 41.0668 47.424 41.7068 47.808C43.8401 49.1307 46.1014 50.9653 46.2721 50.6453C46.4428 50.3253 44.4374 48.3413 42.3254 46.976C41.3659 46.388 40.3513 45.895 39.2961 45.504C39.1494 45.318 38.985 45.1465 38.8054 44.992C38.3644 44.5889 37.8161 44.3222 37.2268 44.224L34.9441 41.216L35.4348 40.1493C36.0363 40.0168 36.5864 39.7124 37.0182 39.2731C37.4499 38.8337 37.7448 38.2784 37.8668 37.6747C38.0766 37.1387 38.1475 36.5585 38.0729 35.9878C37.9983 35.4172 37.7806 34.8746 37.4401 34.4107L37.5681 33.9413C39.0242 33.3633 40.4484 32.7082 41.8348 31.9787C43.0376 32.2063 44.1922 32.6393 45.2481 33.2587C47.1468 34.3467 49.0668 36.2667 49.1521 35.9467C48.281 34.4616 47.048 33.2213 45.5681 32.3413C44.8041 31.873 43.9783 31.514 43.1148 31.2747C43.4988 31.04 43.8828 30.8267 44.2668 30.5707C46.4001 29.2053 50.4748 31.872 50.7308 31.2533Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_301">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-neurons.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-neurons.svg
index 35a1422a8..bb99b59d0 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-neurons.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-neurons.svg
@@ -1,4 +1,4 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <path d="M53.312 59.2L51.7546 61.8666" stroke="white" stroke-width="0.75" stroke-miterlimit="10" stroke-linecap="round"/>
 <path d="M27.8613 25.6C41.088 29.5467 40.1707 32 42.7947 34.816C46.2293 38.5067 46.016 40.8747 48.256 46.6773C49.408 49.664 49.8987 60.3307 57.664 61.0133" stroke="white" stroke-width="0.75" stroke-miterlimit="10" stroke-linecap="round"/>
 <path d="M57.6 55.744L51.7546 57.2373" stroke="white" stroke-width="0.75" stroke-miterlimit="10" stroke-linecap="round"/>
@@ -14,6 +14,6 @@
 <path d="M36.8426 15.296L36.5439 11.8186" stroke="white" stroke-width="0.75" stroke-miterlimit="10" stroke-linecap="round"/>
 <path d="M23.616 33.4933C23.616 33.4933 27.7333 37.0347 27.7333 39.2747C27.9191 40.8524 28.573 42.3384 29.6106 43.5413" stroke="white" stroke-width="0.75" stroke-miterlimit="10" stroke-linecap="round"/>
 <path d="M27.4348 40.512L22.2935 42.688" stroke="white" stroke-width="0.75" stroke-miterlimit="10" stroke-linecap="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7494 35.648C22.3574 32.4053 15.6161 31.6587 11.1574 32.6827C11.9544 30.6738 12.2142 28.492 11.9112 26.3522C11.6082 24.2125 10.7528 22.1885 9.42944 20.48C15.428 19.7817 18.7212 16.9942 21.3528 14.7668C21.8565 14.3405 22.3359 13.9347 22.8054 13.568C24.1704 17.8644 26.1555 17.7628 28.6871 17.6332C29.6375 17.5846 30.6649 17.532 31.7654 17.7067C30.5281 18.9653 27.1574 22.4 29.6321 26.0693C27.8614 26.7947 27.0294 27.4773 26.4961 28.928C25.6494 31.0606 25.3915 33.3816 25.7494 35.648ZM21.6485 22.9949C21.2587 22.2465 20.6186 21.6585 19.8399 21.3333C19.0127 21.1484 18.1466 21.2662 17.3989 21.6655C16.6513 22.0648 16.0716 22.719 15.7652 23.5093C15.2532 25.2373 15.7866 27.008 17.0666 27.3707C18.3466 27.7333 21.3332 27.2853 21.9732 25.4293C22.1532 24.6049 22.0383 23.7434 21.6485 22.9949Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7494 35.648C22.3574 32.4053 15.6161 31.6587 11.1574 32.6827C11.9544 30.6738 12.2142 28.492 11.9112 26.3522C11.6082 24.2125 10.7528 22.1885 9.42944 20.48C15.428 19.7817 18.7212 16.9942 21.3528 14.7668C21.8565 14.3405 22.3359 13.9347 22.8054 13.568C24.1704 17.8644 26.1555 17.7628 28.6871 17.6332C29.6375 17.5846 30.6649 17.532 31.7654 17.7067C30.5281 18.9653 27.1574 22.4 29.6321 26.0693C27.8614 26.7947 27.0294 27.4773 26.4961 28.928C25.6494 31.0606 25.3915 33.3816 25.7494 35.648ZM21.6485 22.9949C21.2587 22.2465 20.6186 21.6585 19.8399 21.3333C19.0127 21.1484 18.1466 21.2662 17.3989 21.6655C16.6513 22.0648 16.0716 22.719 15.7652 23.5093C15.2532 25.2373 15.7866 27.008 17.0666 27.3707C18.3466 27.7333 21.3332 27.2853 21.9732 25.4293C22.1532 24.6049 22.0383 23.7434 21.6485 22.9949Z" />
 <path d="M25.1093 41.4933C25.4416 42.3877 25.5035 43.3602 25.2873 44.2895C25.0711 45.2189 24.5863 46.0641 23.8933 46.72" stroke="white" stroke-width="0.75" stroke-miterlimit="10" stroke-linecap="round"/>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-ovaries.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-ovaries.svg
index 3dfbb5676..662f8b4f2 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-ovaries.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-ovaries.svg
@@ -1,12 +1,12 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_326)">
-<path d="M52.9919 17.2373C48.5546 17.2373 45.1413 18.176 41.2799 18.0693C37.4186 17.9627 35.6479 15.1467 31.9999 15.7227C28.3519 15.1467 26.4959 17.856 22.7199 18.0693C18.9439 18.2827 15.4453 17.2373 11.0079 17.2373C5.20528 17.2373 2.47461 21.504 2.47461 23.872C2.47461 26.24 3.26394 30.272 9.68528 31.8293L10.6239 32C10.2924 31.7505 10.0221 31.4286 9.83361 31.059C9.64508 30.6893 9.54328 30.2816 9.53594 29.8667C9.54354 29.1785 9.81903 28.5204 10.3039 28.032C9.45275 27.8984 8.67231 27.4793 8.0908 26.8435C7.50929 26.2077 7.16129 25.393 7.10394 24.5333C6.95461 21.9093 9.89861 20.992 11.1573 20.9707C14.3518 21.0341 17.5261 21.4927 20.6079 22.336C23.0826 23.296 28.3946 33.3227 28.4586 37.696C28.5226 42.0693 28.6719 50.9867 28.6719 50.9867H35.3279C35.3279 50.9867 35.4559 42.0693 35.5413 37.696C35.6266 33.3227 40.9173 23.296 43.3919 22.336C46.4738 21.4927 49.6481 21.0341 52.8426 20.9707C54.1013 20.9707 57.1093 21.9093 56.8959 24.5333C56.8413 25.3736 56.5104 26.1723 55.9548 26.805C55.3992 27.4378 54.6501 27.8691 53.8239 28.032C54.3148 28.5182 54.5978 29.176 54.6133 29.8667C54.6003 30.2827 54.4939 30.6905 54.3018 31.0598C54.1098 31.4291 53.8371 31.7505 53.5039 32L54.4213 31.8293C60.8213 30.2933 61.6319 26.112 61.6319 23.872C61.6319 21.632 58.7946 17.2373 52.9919 17.2373Z" fill="white"/>
-<path d="M21.3334 27.9253C20.74 28.1059 20.1339 28.2413 19.5201 28.3307C18.8374 28.3307 18.6241 28.1387 18.6241 28.1387C18.1514 27.6418 17.5768 27.253 16.9398 26.9989C16.3028 26.7448 15.6183 26.6315 14.9334 26.6667C12.5867 26.6667 10.6667 28.096 10.6667 29.8667C10.6667 31.6373 12.5867 33.0667 14.9334 33.0667C15.8809 33.1782 16.8366 32.941 17.6218 32.3991C18.4071 31.8573 18.9681 31.0481 19.2001 30.1227C19.2001 30.1227 19.2001 29.696 19.8187 29.376C20.3606 29.1456 20.9256 28.9739 21.5041 28.864L21.3334 27.9253Z" fill="white"/>
-<path d="M42.9013 27.9253C43.5015 28.1076 44.1148 28.2431 44.7359 28.3307C45.4186 28.3307 45.6106 28.1387 45.6106 28.1387C46.0684 27.6446 46.6276 27.2553 47.2499 26.9976C47.8722 26.7398 48.5429 26.6196 49.2159 26.6453C51.5626 26.6453 53.4826 28.0747 53.4826 29.8453C53.4826 31.616 51.5626 33.0453 49.2159 33.0453C48.2699 33.1477 47.3186 32.9068 46.5354 32.3664C45.7522 31.826 45.1893 31.0221 44.9493 30.1013C44.9493 30.1013 44.9493 29.6747 44.3093 29.3547C43.7754 29.1227 43.2172 28.9509 42.6453 28.8427L42.9013 27.9253Z" fill="white"/>
+<path d="M52.9919 17.2373C48.5546 17.2373 45.1413 18.176 41.2799 18.0693C37.4186 17.9627 35.6479 15.1467 31.9999 15.7227C28.3519 15.1467 26.4959 17.856 22.7199 18.0693C18.9439 18.2827 15.4453 17.2373 11.0079 17.2373C5.20528 17.2373 2.47461 21.504 2.47461 23.872C2.47461 26.24 3.26394 30.272 9.68528 31.8293L10.6239 32C10.2924 31.7505 10.0221 31.4286 9.83361 31.059C9.64508 30.6893 9.54328 30.2816 9.53594 29.8667C9.54354 29.1785 9.81903 28.5204 10.3039 28.032C9.45275 27.8984 8.67231 27.4793 8.0908 26.8435C7.50929 26.2077 7.16129 25.393 7.10394 24.5333C6.95461 21.9093 9.89861 20.992 11.1573 20.9707C14.3518 21.0341 17.5261 21.4927 20.6079 22.336C23.0826 23.296 28.3946 33.3227 28.4586 37.696C28.5226 42.0693 28.6719 50.9867 28.6719 50.9867H35.3279C35.3279 50.9867 35.4559 42.0693 35.5413 37.696C35.6266 33.3227 40.9173 23.296 43.3919 22.336C46.4738 21.4927 49.6481 21.0341 52.8426 20.9707C54.1013 20.9707 57.1093 21.9093 56.8959 24.5333C56.8413 25.3736 56.5104 26.1723 55.9548 26.805C55.3992 27.4378 54.6501 27.8691 53.8239 28.032C54.3148 28.5182 54.5978 29.176 54.6133 29.8667C54.6003 30.2827 54.4939 30.6905 54.3018 31.0598C54.1098 31.4291 53.8371 31.7505 53.5039 32L54.4213 31.8293C60.8213 30.2933 61.6319 26.112 61.6319 23.872C61.6319 21.632 58.7946 17.2373 52.9919 17.2373Z" />
+<path d="M21.3334 27.9253C20.74 28.1059 20.1339 28.2413 19.5201 28.3307C18.8374 28.3307 18.6241 28.1387 18.6241 28.1387C18.1514 27.6418 17.5768 27.253 16.9398 26.9989C16.3028 26.7448 15.6183 26.6315 14.9334 26.6667C12.5867 26.6667 10.6667 28.096 10.6667 29.8667C10.6667 31.6373 12.5867 33.0667 14.9334 33.0667C15.8809 33.1782 16.8366 32.941 17.6218 32.3991C18.4071 31.8573 18.9681 31.0481 19.2001 30.1227C19.2001 30.1227 19.2001 29.696 19.8187 29.376C20.3606 29.1456 20.9256 28.9739 21.5041 28.864L21.3334 27.9253Z" />
+<path d="M42.9013 27.9253C43.5015 28.1076 44.1148 28.2431 44.7359 28.3307C45.4186 28.3307 45.6106 28.1387 45.6106 28.1387C46.0684 27.6446 46.6276 27.2553 47.2499 26.9976C47.8722 26.7398 48.5429 26.6196 49.2159 26.6453C51.5626 26.6453 53.4826 28.0747 53.4826 29.8453C53.4826 31.616 51.5626 33.0453 49.2159 33.0453C48.2699 33.1477 47.3186 32.9068 46.5354 32.3664C45.7522 31.826 45.1893 31.0221 44.9493 30.1013C44.9493 30.1013 44.9493 29.6747 44.3093 29.3547C43.7754 29.1227 43.2172 28.9509 42.6453 28.8427L42.9013 27.9253Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_326">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-ovary-left.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-ovary-left.svg
index ef5f0df1a..3b304d39b 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-ovary-left.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-ovary-left.svg
@@ -1,6 +1,6 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M28.8639 32.832L41.8772 20.032L42.4319 22.6347C42.4319 22.6347 32.1919 28.5867 29.2692 34.5813C28.3519 31.7013 28.8639 32.832 28.8639 32.832Z" fill="white" stroke="white" stroke-miterlimit="10"/>
-<path d="M57.8987 5.99468C50.3894 4.71468 49.4934 12.0747 45.5467 12.3947C43.7367 12.4623 41.961 11.8881 40.5334 10.7733L38.6774 16.256C38.6774 16.256 40.9174 18.3893 41.0667 19.8187C41.216 21.248 39.8507 26.3893 41.8987 30.272C43.9467 34.1547 46.9334 36.9067 47.5734 39.7653C48.2134 42.624 47.7227 43.648 49.216 50.2187C49.9164 53.8356 51.4504 57.2395 53.696 60.16H57.9627L57.8987 5.99468Z" fill="white"/>
-<path d="M29.4756 47.73C33.2475 45.9776 34.3815 40.4165 32.0085 35.309C29.6355 30.2015 24.6541 27.4817 20.8823 29.2341C17.1104 30.9866 15.9764 36.5476 18.3494 41.6551C20.7224 46.7626 25.7038 49.4824 29.4756 47.73Z" fill="white"/>
-<path d="M17.8133 22.2293C19.9467 24.064 21.1627 25.2373 22.4853 26.496C21.6153 26.4136 20.7378 26.528 19.9179 26.8308C19.0981 27.1336 18.3569 27.6171 17.7493 28.2453C16.721 29.136 15.8922 30.2337 15.3173 31.4667C12.9651 28.947 10.9041 26.1704 9.17334 23.1893C0.597337 10.6667 12.3093 2.43201 25.8347 4.84268C31.5209 6.16923 36.9391 8.45627 41.856 11.6053L39.3387 17.0667C35.5327 13.7417 31.0153 11.3334 26.1333 10.0267C16.8107 7.74401 7.72267 13.376 17.8133 22.2293Z" fill="white"/>
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+<path d="M28.8639 32.832L41.8772 20.032L42.4319 22.6347C42.4319 22.6347 32.1919 28.5867 29.2692 34.5813C28.3519 31.7013 28.8639 32.832 28.8639 32.832Z"  stroke="white" stroke-miterlimit="10"/>
+<path d="M57.8987 5.99468C50.3894 4.71468 49.4934 12.0747 45.5467 12.3947C43.7367 12.4623 41.961 11.8881 40.5334 10.7733L38.6774 16.256C38.6774 16.256 40.9174 18.3893 41.0667 19.8187C41.216 21.248 39.8507 26.3893 41.8987 30.272C43.9467 34.1547 46.9334 36.9067 47.5734 39.7653C48.2134 42.624 47.7227 43.648 49.216 50.2187C49.9164 53.8356 51.4504 57.2395 53.696 60.16H57.9627L57.8987 5.99468Z" />
+<path d="M29.4756 47.73C33.2475 45.9776 34.3815 40.4165 32.0085 35.309C29.6355 30.2015 24.6541 27.4817 20.8823 29.2341C17.1104 30.9866 15.9764 36.5476 18.3494 41.6551C20.7224 46.7626 25.7038 49.4824 29.4756 47.73Z" />
+<path d="M17.8133 22.2293C19.9467 24.064 21.1627 25.2373 22.4853 26.496C21.6153 26.4136 20.7378 26.528 19.9179 26.8308C19.0981 27.1336 18.3569 27.6171 17.7493 28.2453C16.721 29.136 15.8922 30.2337 15.3173 31.4667C12.9651 28.947 10.9041 26.1704 9.17334 23.1893C0.597337 10.6667 12.3093 2.43201 25.8347 4.84268C31.5209 6.16923 36.9391 8.45627 41.856 11.6053L39.3387 17.0667C35.5327 13.7417 31.0153 11.3334 26.1333 10.0267C16.8107 7.74401 7.72267 13.376 17.8133 22.2293Z" />
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-ovary-right.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-ovary-right.svg
index df90f25bb..5198bcba5 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-ovary-right.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-ovary-right.svg
@@ -1,6 +1,6 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M35.7119 33.5573L22.6986 20.7573L22.1439 23.3387C22.1439 23.3387 32.3839 29.2907 35.3066 35.2853C36.2666 32.4267 35.7119 33.5573 35.7119 33.5573Z" fill="white" stroke="white" stroke-miterlimit="10"/>
-<path d="M7.38129 6.39998C14.912 5.11998 15.9146 12.48 19.7546 12.8C21.5676 12.8924 23.3537 12.3323 24.7893 11.2213L26.6666 16.704C26.6666 16.704 24.4266 18.8373 24.2773 20.2666C24.128 21.696 25.4933 26.8373 23.424 30.72C21.3546 34.6026 18.4533 37.3547 17.728 40.2133C17.0026 43.072 17.5786 44.096 16.0853 50.6666C15.3849 54.2836 13.851 57.6874 11.6053 60.608H7.33862L7.38129 6.39998Z" fill="white"/>
-<path d="M46.2043 42.3904C48.5773 37.2829 47.4433 31.7219 43.6714 29.9694C39.8996 28.217 34.9182 30.9368 32.5452 36.0443C30.1722 41.1518 31.3062 46.7128 35.0781 48.4653C38.8499 50.2177 43.8313 47.4979 46.2043 42.3904Z" fill="white"/>
-<path d="M47.488 22.5493C45.3547 24.384 44.1173 25.5573 42.816 26.816C43.6829 26.7337 44.5571 26.8483 45.3735 27.1512C46.1899 27.4541 46.9273 27.9375 47.5307 28.5653C48.5649 29.4556 49.4007 30.553 49.984 31.7867C52.3324 29.2533 54.3863 26.4622 56.1067 23.4667C64.64 10.944 52.992 2.70933 39.4667 5.11999C34.0026 6.33072 28.7955 8.49735 24.0853 11.52L26.048 17.152C29.8287 13.8727 34.3091 11.5012 39.1467 10.2187C48.4907 8.06399 57.6 13.696 47.488 22.5493Z" fill="white"/>
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+<path d="M35.7119 33.5573L22.6986 20.7573L22.1439 23.3387C22.1439 23.3387 32.3839 29.2907 35.3066 35.2853C36.2666 32.4267 35.7119 33.5573 35.7119 33.5573Z"  stroke="white" stroke-miterlimit="10"/>
+<path d="M7.38129 6.39998C14.912 5.11998 15.9146 12.48 19.7546 12.8C21.5676 12.8924 23.3537 12.3323 24.7893 11.2213L26.6666 16.704C26.6666 16.704 24.4266 18.8373 24.2773 20.2666C24.128 21.696 25.4933 26.8373 23.424 30.72C21.3546 34.6026 18.4533 37.3547 17.728 40.2133C17.0026 43.072 17.5786 44.096 16.0853 50.6666C15.3849 54.2836 13.851 57.6874 11.6053 60.608H7.33862L7.38129 6.39998Z" />
+<path d="M46.2043 42.3904C48.5773 37.2829 47.4433 31.7219 43.6714 29.9694C39.8996 28.217 34.9182 30.9368 32.5452 36.0443C30.1722 41.1518 31.3062 46.7128 35.0781 48.4653C38.8499 50.2177 43.8313 47.4979 46.2043 42.3904Z" />
+<path d="M47.488 22.5493C45.3547 24.384 44.1173 25.5573 42.816 26.816C43.6829 26.7337 44.5571 26.8483 45.3735 27.1512C46.1899 27.4541 46.9273 27.9375 47.5307 28.5653C48.5649 29.4556 49.4007 30.553 49.984 31.7867C52.3324 29.2533 54.3863 26.4622 56.1067 23.4667C64.64 10.944 52.992 2.70933 39.4667 5.11999C34.0026 6.33072 28.7955 8.49735 24.0853 11.52L26.048 17.152C29.8287 13.8727 34.3091 11.5012 39.1467 10.2187C48.4907 8.06399 57.6 13.696 47.488 22.5493Z" />
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-palatine-tonsil.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-palatine-tonsil.svg
index 8d59e1795..42e1c0d27 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-palatine-tonsil.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-palatine-tonsil.svg
@@ -1,13 +1,13 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_489)">
-<path d="M47.9476 26.0042C47.9476 26.0042 47.9274 26.0042 47.9072 25.984C47.8667 25.5395 47.2401 18.7702 45.7644 15.5573C45.7442 15.4967 45.7038 15.4361 45.6431 15.3957C44.3696 14.3247 43.4195 14.7693 42.8939 15.0117C42.8131 15.0522 42.6918 15.0926 42.7322 15.1128C41.9236 14.8703 41.2161 15.0724 40.8118 15.6584C40.4075 16.2039 40.3873 17.0324 40.6905 17.7397C39.9628 18.2044 39.8213 18.8106 39.801 19.1541C39.7808 19.5987 39.9426 20.0432 40.2256 20.3868C39.9426 20.6494 39.7606 21.0334 39.7606 21.4577C39.7606 21.9831 40.0436 22.6499 40.8522 23.0338C40.7309 23.1753 40.6299 23.3773 40.6703 23.5996C40.6905 23.7815 40.7916 23.9229 40.9533 24.0644C40.9937 24.3877 41.1352 24.7918 41.4789 25.1353C42.0651 25.6809 42.995 25.8628 44.2685 25.6809C44.6526 26.2669 45.5016 27.1358 46.2496 27.3783C46.4113 27.4389 46.573 27.4591 46.7347 27.4591C47.2401 27.4591 47.705 27.1964 48.0689 26.6711C48.2104 26.469 48.1498 26.1861 47.9476 26.0446V26.0042Z" fill="white"/>
-<path d="M35.6772 28.1663C35.6166 28.3078 35.5761 28.7119 35.5559 28.8332C35.5357 28.8938 34.7878 30.6316 35.6166 36.5522C35.657 36.7946 35.4751 36.9967 35.2527 37.0371C35.2325 37.0371 35.2123 37.0371 35.1921 37.0371C34.9899 37.0371 34.7878 36.8755 34.7675 36.6734C33.8983 30.3487 34.7675 28.7523 34.7878 28.4897C34.7878 28.4088 34.8484 28.2876 34.909 28.1663C34.909 28.1663 34.9293 28.1259 34.909 28.0855C34.8888 28.0451 32.6854 28.0047 32.6854 28.0047C32.1801 28.0047 31.5736 28.0047 30.8054 27.9643C26.0954 27.7016 24.2963 29.8031 23.7909 30.5912C23.5483 30.7124 23.5483 31.0963 23.5483 31.9854C23.5483 33.5413 23.7101 37.5625 25.2464 41.1795C27.0859 45.5038 30.3203 47.8073 34.6058 47.8073C39.4372 47.8073 45.4207 45.0188 46.4719 31.7834C46.4719 31.5611 46.4921 31.3792 46.5123 31.2782C46.573 31.157 46.5932 31.0155 46.5325 30.8943C46.5325 30.8539 46.4921 30.8134 46.4517 30.773C45.724 29.4192 42.1662 27.7622 39.0935 27.7622C37.8402 27.7622 36.7688 27.9643 36.0006 28.1259C36.0006 28.1259 35.7176 28.1057 35.6772 28.1663Z" fill="white"/>
-<path d="M34.2218 51C20.314 51 19.4852 30.6316 19.4852 30.4295C19.4852 30.1668 19.6874 29.9243 19.9502 29.9243C20.2534 29.9243 20.4555 30.1264 20.4555 30.4093C20.4555 30.6114 21.2439 50.0301 34.2218 50.0301C47.1997 50.0301 48.5945 36.8755 49.2818 30.5508L49.3222 30.2477C49.3425 29.985 49.5648 29.7627 49.868 29.8233C50.1308 29.8435 50.333 30.086 50.2926 30.3689L50.2521 30.672C49.585 36.7542 48.0487 51.0202 34.2218 51.0202V51Z" fill="white"/>
-<path d="M50.2521 28.0047C49.8882 28.0047 49.5648 27.7218 49.5042 27.3581C47.8061 15.3553 45.2995 9.51551 41.8428 9.51551C38.386 9.51551 38.1637 10.9906 38.0424 12.8496C37.9211 14.3449 37.7796 16.406 34.9495 16.406C32.4833 16.406 32.2407 14.5066 32.0588 13.1123C31.796 11.1725 31.5737 9.51551 27.5509 9.51551C24.7006 9.51551 22.3153 15.3755 20.5162 26.9337C20.4555 27.3581 20.0714 27.641 19.6469 27.5602C19.2426 27.4995 18.9596 27.1156 19.0203 26.6913C21.0417 13.7589 23.6697 8 27.5711 8C32.928 8 33.3121 10.9502 33.5749 12.9102C33.7973 14.5066 33.9388 14.8905 34.9697 14.8905C36.3241 14.8905 36.4252 14.3651 36.5465 12.7486C36.688 10.8492 36.8901 8 41.863 8C46.3304 8 49.1403 13.9004 51.0001 27.1358C51.0607 27.5602 50.7777 27.9441 50.3532 27.9845C50.3128 27.9845 50.2723 27.9845 50.2521 27.9845V28.0047Z" fill="white"/>
+<path d="M47.9476 26.0042C47.9476 26.0042 47.9274 26.0042 47.9072 25.984C47.8667 25.5395 47.2401 18.7702 45.7644 15.5573C45.7442 15.4967 45.7038 15.4361 45.6431 15.3957C44.3696 14.3247 43.4195 14.7693 42.8939 15.0117C42.8131 15.0522 42.6918 15.0926 42.7322 15.1128C41.9236 14.8703 41.2161 15.0724 40.8118 15.6584C40.4075 16.2039 40.3873 17.0324 40.6905 17.7397C39.9628 18.2044 39.8213 18.8106 39.801 19.1541C39.7808 19.5987 39.9426 20.0432 40.2256 20.3868C39.9426 20.6494 39.7606 21.0334 39.7606 21.4577C39.7606 21.9831 40.0436 22.6499 40.8522 23.0338C40.7309 23.1753 40.6299 23.3773 40.6703 23.5996C40.6905 23.7815 40.7916 23.9229 40.9533 24.0644C40.9937 24.3877 41.1352 24.7918 41.4789 25.1353C42.0651 25.6809 42.995 25.8628 44.2685 25.6809C44.6526 26.2669 45.5016 27.1358 46.2496 27.3783C46.4113 27.4389 46.573 27.4591 46.7347 27.4591C47.2401 27.4591 47.705 27.1964 48.0689 26.6711C48.2104 26.469 48.1498 26.1861 47.9476 26.0446V26.0042Z" />
+<path d="M35.6772 28.1663C35.6166 28.3078 35.5761 28.7119 35.5559 28.8332C35.5357 28.8938 34.7878 30.6316 35.6166 36.5522C35.657 36.7946 35.4751 36.9967 35.2527 37.0371C35.2325 37.0371 35.2123 37.0371 35.1921 37.0371C34.9899 37.0371 34.7878 36.8755 34.7675 36.6734C33.8983 30.3487 34.7675 28.7523 34.7878 28.4897C34.7878 28.4088 34.8484 28.2876 34.909 28.1663C34.909 28.1663 34.9293 28.1259 34.909 28.0855C34.8888 28.0451 32.6854 28.0047 32.6854 28.0047C32.1801 28.0047 31.5736 28.0047 30.8054 27.9643C26.0954 27.7016 24.2963 29.8031 23.7909 30.5912C23.5483 30.7124 23.5483 31.0963 23.5483 31.9854C23.5483 33.5413 23.7101 37.5625 25.2464 41.1795C27.0859 45.5038 30.3203 47.8073 34.6058 47.8073C39.4372 47.8073 45.4207 45.0188 46.4719 31.7834C46.4719 31.5611 46.4921 31.3792 46.5123 31.2782C46.573 31.157 46.5932 31.0155 46.5325 30.8943C46.5325 30.8539 46.4921 30.8134 46.4517 30.773C45.724 29.4192 42.1662 27.7622 39.0935 27.7622C37.8402 27.7622 36.7688 27.9643 36.0006 28.1259C36.0006 28.1259 35.7176 28.1057 35.6772 28.1663Z" />
+<path d="M34.2218 51C20.314 51 19.4852 30.6316 19.4852 30.4295C19.4852 30.1668 19.6874 29.9243 19.9502 29.9243C20.2534 29.9243 20.4555 30.1264 20.4555 30.4093C20.4555 30.6114 21.2439 50.0301 34.2218 50.0301C47.1997 50.0301 48.5945 36.8755 49.2818 30.5508L49.3222 30.2477C49.3425 29.985 49.5648 29.7627 49.868 29.8233C50.1308 29.8435 50.333 30.086 50.2926 30.3689L50.2521 30.672C49.585 36.7542 48.0487 51.0202 34.2218 51.0202V51Z" />
+<path d="M50.2521 28.0047C49.8882 28.0047 49.5648 27.7218 49.5042 27.3581C47.8061 15.3553 45.2995 9.51551 41.8428 9.51551C38.386 9.51551 38.1637 10.9906 38.0424 12.8496C37.9211 14.3449 37.7796 16.406 34.9495 16.406C32.4833 16.406 32.2407 14.5066 32.0588 13.1123C31.796 11.1725 31.5737 9.51551 27.5509 9.51551C24.7006 9.51551 22.3153 15.3755 20.5162 26.9337C20.4555 27.3581 20.0714 27.641 19.6469 27.5602C19.2426 27.4995 18.9596 27.1156 19.0203 26.6913C21.0417 13.7589 23.6697 8 27.5711 8C32.928 8 33.3121 10.9502 33.5749 12.9102C33.7973 14.5066 33.9388 14.8905 34.9697 14.8905C36.3241 14.8905 36.4252 14.3651 36.5465 12.7486C36.688 10.8492 36.8901 8 41.863 8C46.3304 8 49.1403 13.9004 51.0001 27.1358C51.0607 27.5602 50.7777 27.9441 50.3532 27.9845C50.3128 27.9845 50.2723 27.9845 50.2521 27.9845V28.0047Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_489">
-<rect width="32" height="43" fill="white" transform="translate(19 8)"/>
+<rect width="32" height="43"  transform="translate(19 8)"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-pancreas.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-pancreas.svg
index f006ff8e6..844e82db0 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-pancreas.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-pancreas.svg
@@ -1,12 +1,12 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_346)">
-<path d="M56.7253 16.6827C56.8245 16.3819 56.8392 16.0597 56.7677 15.7512C56.6962 15.4427 56.5413 15.1598 56.3199 14.9333C56.5381 14.6607 56.6584 14.3225 56.6613 13.9733C56.6853 13.5641 56.5631 13.1596 56.3164 12.8321C56.0697 12.5047 55.7146 12.2757 55.3145 12.1859C54.9145 12.0962 54.4956 12.1516 54.1327 12.3422C53.7697 12.5329 53.4864 12.8464 53.3333 13.2267C53.1139 13.1384 52.8789 13.0956 52.6424 13.1007C52.406 13.1059 52.1731 13.1589 51.9577 13.2566C51.7424 13.3543 51.5491 13.4947 51.3895 13.6692C51.2299 13.8437 51.1074 14.0488 51.0293 14.272C50.8244 14.1947 50.6082 14.1514 50.3893 14.144C49.9661 14.1466 49.5585 14.3044 49.2439 14.5876C48.9294 14.8707 48.7296 15.2594 48.6826 15.68H48.4053C47.9393 15.68 47.4922 15.8636 47.1607 16.191C46.8293 16.5185 46.6402 16.9634 46.6346 17.4293C46.6475 17.597 46.6834 17.7621 46.7413 17.92C46.5021 17.8015 46.2401 17.736 45.9733 17.728C45.5477 17.73 45.1375 17.8871 44.8194 18.1698C44.5013 18.4526 44.2972 18.8416 44.2453 19.264C43.9526 19.0348 43.593 18.9075 43.2213 18.9013C42.7891 18.9045 42.3734 19.0676 42.0544 19.3591C41.7353 19.6506 41.5354 20.0499 41.4933 20.48C41.3365 20.2709 41.1338 20.1006 40.9007 19.9822C40.6677 19.8639 40.4106 19.8006 40.1493 19.7973C39.7936 19.799 39.4466 19.9078 39.1536 20.1094C38.8606 20.3111 38.6352 20.5963 38.5066 20.928C38.207 20.6791 37.8295 20.5432 37.4399 20.544C37.1761 20.5502 36.917 20.6147 36.681 20.7327C36.4449 20.8507 36.2379 21.0194 36.0746 21.2267C35.9253 20.9808 35.7156 20.7772 35.4654 20.6353C35.2153 20.4934 34.9329 20.4179 34.6453 20.416C34.3803 20.416 34.119 20.4777 33.882 20.5962C33.6451 20.7147 33.4389 20.8867 33.2799 21.0987C33.1349 20.8162 32.9148 20.5791 32.6438 20.4135C32.3729 20.2479 32.0615 20.1602 31.7439 20.16C31.3799 20.1634 31.0259 20.2804 30.7315 20.4945C30.437 20.7087 30.2167 21.0093 30.1013 21.3547C29.8606 21.2429 29.5986 21.1847 29.3333 21.184C29.077 21.1864 28.8247 21.2472 28.5955 21.3618C28.3663 21.4764 28.1663 21.6418 28.0106 21.8453C27.8109 21.6437 27.5651 21.4938 27.2945 21.4083C27.0239 21.3229 26.7365 21.3046 26.4573 21.355C26.178 21.4054 25.9152 21.523 25.6915 21.6976C25.4678 21.8722 25.29 22.0986 25.1733 22.3573C25.0476 22.0297 24.8252 21.748 24.5356 21.5498C24.246 21.3517 23.9029 21.2464 23.5519 21.248C23.1231 21.2506 22.7102 21.4107 22.3916 21.6978C22.073 21.9849 21.871 22.3791 21.8239 22.8053C21.6734 22.7475 21.5154 22.7116 21.3546 22.6987C20.8907 22.6987 20.4457 22.883 20.1176 23.211C19.7896 23.5391 19.6053 23.984 19.6053 24.448C19.573 24.6315 19.573 24.8192 19.6053 25.0027C19.4022 24.9192 19.1849 24.8758 18.9653 24.8747C18.5013 24.8747 18.0564 25.059 17.7283 25.387C17.4003 25.7151 17.2159 26.16 17.2159 26.624C17.2204 26.9695 17.3322 27.305 17.5359 27.584C17.07 27.584 16.6228 27.7676 16.2914 28.095C15.9599 28.4225 15.7709 28.8674 15.7653 29.3333C15.7727 29.5522 15.816 29.7684 15.8933 29.9733C15.4841 29.979 15.0902 30.1296 14.7817 30.3985C14.4732 30.6674 14.2701 31.0371 14.2087 31.4417C14.1472 31.8462 14.2314 32.2595 14.4461 32.6079C14.6608 32.9563 14.9922 33.2171 15.3813 33.344C14.841 34.1044 14.5502 35.0139 14.5493 35.9467C14.5497 36.638 14.7181 37.3188 15.0399 37.9307C16.3138 36.2898 17.704 34.7427 19.1999 33.3013C19.2776 32.4843 19.5246 31.6923 19.9253 30.976C19.8386 30.4104 19.8386 29.8349 19.9253 29.2693C19.9849 28.8786 20.1468 28.5106 20.3946 28.2027C20.6339 27.9612 20.8288 27.6796 20.9706 27.3707C21.1133 26.9043 21.2133 26.4258 21.2693 25.9413C21.2814 26.4626 21.2457 26.9839 21.1626 27.4987C21.0653 27.7927 20.9052 28.0621 20.6933 28.288C20.4317 28.5768 20.274 28.9447 20.2453 29.3333C20.2206 29.6742 20.2206 30.0164 20.2453 30.3573C20.5948 29.8096 21.0798 29.3614 21.6533 29.056C22.1773 28.8062 22.6538 28.4669 23.0613 28.0533C23.7226 27.0507 24.7679 25.3227 24.7679 25.3227C24.418 26.3939 23.9828 27.4355 23.4666 28.4373C23.1123 28.9051 22.6611 29.2907 22.1439 29.568C21.4737 29.9006 20.9605 30.4827 20.7146 31.1893C20.5209 31.6139 20.3708 32.0571 20.2666 32.512C21.4614 31.4497 22.7463 30.4932 24.1066 29.6533C26.0528 28.4708 28.2402 27.7417 30.5066 27.52H31.1679C31.3086 27.1612 31.4725 26.8121 31.6586 26.4747C31.8979 26.0192 32.2699 25.6473 32.7253 25.408L33.5999 24.832C34.0504 24.3162 34.4175 23.7332 34.6879 23.104C34.5363 23.7108 34.3143 24.2979 34.0266 24.8533C33.75 25.1879 33.4091 25.4636 33.0239 25.664C32.5822 25.877 32.2387 26.2511 32.0639 26.7093C32.0639 26.9867 31.8933 27.2213 31.8293 27.456H31.9999C33.8975 27.3953 35.7875 27.1885 37.6533 26.8373C38.9033 26.5344 40.1032 26.053 41.2159 25.408C41.6723 24.6585 42.1859 23.9452 42.7519 23.2747C43.2953 22.8402 43.9084 22.5011 44.5653 22.272C44.0624 22.5375 43.5963 22.8674 43.1786 23.2533C42.7966 23.7571 42.5142 24.3291 42.3466 24.9387C44.7307 23.8165 46.9842 22.4358 49.0666 20.8213C49.0666 20.8213 41.7919 28.2667 32.8106 28.5227H31.9786C32.2812 28.7245 32.5945 28.9096 32.9173 29.0773C33.5876 29.381 34.3446 29.434 35.0506 29.2267C35.4133 29.0987 36.0746 28.6933 36.5866 28.8427C37.4794 28.9569 38.386 28.8009 39.1893 28.3947C39.1893 28.3947 37.5679 29.568 36.5439 29.248C36.1599 29.1413 35.3706 29.6747 35.0293 29.76C34.2732 30.0032 33.46 30.0032 32.7039 29.76C32.0407 29.4704 31.4171 29.0976 30.8479 28.6507C28.5194 28.8196 26.2927 29.6731 24.4479 31.104C23.1893 32.064 22.1013 32.896 21.1413 33.728C21.7274 33.8944 22.327 34.0086 22.9333 34.0693C23.7368 34.1403 24.5391 33.9208 25.1946 33.4507C25.4719 33.1947 25.8559 32.576 26.3679 32.512C27.4346 32.4053 28.5013 30.9973 28.5013 30.9973C28.5013 30.9973 27.5839 32.7467 26.5173 32.8533C26.1119 32.8533 25.5786 33.8347 25.3013 34.048C24.7059 34.4564 23.9963 34.6656 23.2746 34.6453C22.3427 34.6648 21.4136 34.5352 20.5226 34.2613C18.818 35.6488 17.3359 37.2891 16.1279 39.1253C16.8906 39.8032 17.861 40.2019 18.8799 40.256C18.8799 40.6304 18.954 41.0011 19.0979 41.3467C19.2419 41.6924 19.4528 42.0061 19.7185 42.2699C19.9842 42.5336 20.2996 42.7422 20.6463 42.8835C20.993 43.0248 21.3642 43.0961 21.7386 43.0933C22.2071 43.0888 22.6671 42.9674 23.0769 42.7401C23.4867 42.5129 23.8333 42.187 24.0853 41.792C24.4556 41.9542 24.8544 42.0412 25.2586 42.048C25.8279 42.0466 26.3837 41.8753 26.855 41.5561C27.3263 41.2368 27.6915 40.7841 27.9039 40.256C28.2037 40.3727 28.5211 40.4377 28.8426 40.448C29.6064 40.448 30.339 40.1446 30.8791 39.6045C31.4192 39.0644 31.7226 38.3318 31.7226 37.568C31.7125 37.139 31.6106 36.7171 31.4239 36.3307C31.7496 36.1686 32.0238 35.9191 32.2159 35.6102C32.408 35.3013 32.5105 34.9451 32.5119 34.5813C32.5219 34.482 32.5219 34.382 32.5119 34.2827C32.6184 34.2927 32.7255 34.2927 32.8319 34.2827C33.3361 34.2887 33.8227 34.0984 34.189 33.752C34.5553 33.4056 34.7725 32.9303 34.7946 32.4267C35.1264 32.6795 35.5295 32.8214 35.9466 32.832C36.3901 32.8281 36.8192 32.6742 37.1639 32.3953C37.5087 32.1164 37.7489 31.7289 37.8453 31.296C37.9936 31.5617 38.2103 31.7829 38.4729 31.9367C38.7354 32.0904 39.0343 32.1712 39.3386 32.1707C39.7708 32.1675 40.1865 32.0044 40.5055 31.7129C40.8246 31.4214 41.0245 31.0221 41.0666 30.592C41.2367 30.6126 41.4086 30.6126 41.5786 30.592C41.8846 30.5882 42.184 30.5033 42.4464 30.3459C42.7088 30.1884 42.9247 29.9642 43.0719 29.696C43.3734 29.9418 43.7497 30.0773 44.1386 30.08C44.5237 30.0765 44.8966 29.9444 45.198 29.7048C45.4995 29.4652 45.7123 29.1317 45.8026 28.7573C46.0045 28.8447 46.2226 28.8883 46.4426 28.8853C46.6723 28.8853 46.8998 28.8401 47.1121 28.7522C47.3243 28.6643 47.5171 28.5354 47.6796 28.373C47.842 28.2105 47.9709 28.0177 48.0588 27.8054C48.1467 27.5932 48.1919 27.3657 48.1919 27.136C48.2143 26.9589 48.2143 26.7797 48.1919 26.6027C48.3754 26.635 48.5631 26.635 48.7466 26.6027C49.1927 26.6035 49.6222 26.4339 49.9473 26.1286C50.2725 25.8232 50.4687 25.4052 50.4959 24.96C50.6308 24.9719 50.7664 24.9719 50.9013 24.96C51.3652 24.96 51.8102 24.7757 52.1382 24.4476C52.4663 24.1196 52.6506 23.6746 52.6506 23.2107C53.0578 23.1453 53.4287 22.9382 53.6981 22.626C53.9674 22.3137 54.1178 21.9163 54.1226 21.504C54.1226 21.504 54.1226 21.376 54.1226 21.312C54.5027 21.2293 54.8432 21.0193 55.0876 20.7167C55.3321 20.414 55.4658 20.037 55.4666 19.648C55.5365 19.5012 55.6005 19.3518 55.6586 19.2C55.856 19.0119 56.0027 18.7771 56.0853 18.5173C56.1488 18.2508 56.1488 17.9732 56.0853 17.7067C56.0853 17.7067 56.0853 17.536 56.0853 17.4507C56.3696 17.2633 56.5923 16.9961 56.7253 16.6827Z" fill="white"/>
-<path d="M47.3814 34.816C46.1232 33.5749 44.5764 32.6659 42.88 32.1707C42.8448 32.6635 42.6577 33.1333 42.3444 33.5153C42.0311 33.8974 41.6071 34.1729 41.1307 34.304C40.8452 34.3256 40.5584 34.2895 40.2871 34.1978C40.0159 34.1062 39.7659 33.9609 39.552 33.7707C39.4454 35.1573 37.632 35.392 36.608 35.0507H36.16C36.1722 35.1855 36.1722 35.3212 36.16 35.456C36.1477 35.9458 35.9995 36.4226 35.7321 36.8332C35.4647 37.2438 35.0884 37.572 34.6454 37.7813C34.9112 38.2881 35.0503 38.8517 35.0507 39.424C35.0396 39.9339 34.9282 40.4366 34.7227 40.9035C34.5173 41.3703 34.2219 41.7921 33.8534 42.1447C33.4849 42.4974 33.0506 42.774 32.5752 42.9587C32.0998 43.1434 31.5926 43.2327 31.0827 43.2213C30.6304 43.2124 30.183 43.1258 29.76 42.9653C29.4549 43.683 28.943 44.2936 28.2895 44.7192C27.6359 45.1447 26.8705 45.3659 26.0907 45.3547C25.5326 45.3531 24.9807 45.2369 24.4694 45.0133C24.1072 45.547 23.6211 45.985 23.0526 46.2897C22.4842 46.5943 21.8503 46.7566 21.2054 46.7627C20.6955 46.774 20.1883 46.6847 19.7129 46.5C19.2375 46.3153 18.8031 46.0387 18.4346 45.6861C18.0662 45.3334 17.7708 44.9116 17.5653 44.4448C17.3599 43.978 17.2484 43.4752 17.2374 42.9653C15.6863 42.9434 14.2045 42.3189 13.1056 41.224C12.0068 40.1291 11.3769 38.6497 11.3494 37.0987C11.3524 35.8594 11.7566 34.6545 12.5014 33.664C12.0633 33.5862 11.6606 33.3734 11.3494 33.0554C11.0383 32.7374 10.8344 32.3301 10.7662 31.8904C10.698 31.4508 10.769 31.0009 10.9692 30.6035C11.1694 30.2062 11.4888 29.8815 11.8827 29.6747C11.8827 29.504 11.8827 29.3333 11.8827 29.1627C11.8389 28.4897 11.9553 27.8159 12.2223 27.1966C12.4893 26.5774 12.8993 26.0302 13.4187 25.6C13.6463 25.4012 13.906 25.2425 14.1867 25.1307C13.2694 25.1307 12.0534 24.064 11.456 22.4853C11.1072 21.933 10.9221 21.2932 10.9221 20.64C10.9221 19.9868 11.1072 19.347 11.456 18.7947C10.2529 19.1333 9.14834 19.7551 8.2347 20.608C7.17483 21.7972 6.35985 23.1837 5.83638 24.6883C5.31291 26.1928 5.09123 27.7857 5.18403 29.376C5.10014 32.5752 5.65924 35.7588 6.82821 38.738C7.99717 41.7172 9.75222 44.4315 11.9894 46.72C14.0899 48.8329 16.9065 50.0813 19.8827 50.2187H20.1814C28.1387 50.3893 31.68 45.952 34.24 42.56C36.3734 39.7227 37.3974 38.6987 39.488 38.6987C44.608 38.6987 44.6507 47.936 44.6507 48.4053C44.6984 48.8359 44.8308 49.2528 45.0402 49.632C45.2496 50.0112 45.532 50.3453 45.8711 50.615C46.2101 50.8846 46.5992 51.0846 47.0158 51.2033C47.4324 51.322 47.8684 51.3571 48.2987 51.3067C51.392 51.3067 51.9894 49.1733 51.9894 48.512C51.9894 47.8507 52.2027 39.5947 47.3814 34.816Z" fill="white"/>
-<path d="M15.3036 24.4848C16.184 24.1164 16.3445 22.4961 15.6622 20.8658C14.9799 19.2355 13.7132 18.2126 12.8328 18.581C11.9524 18.9494 11.7919 20.5697 12.4742 22.2C13.1565 23.8303 14.4233 24.8533 15.3036 24.4848Z" fill="white"/>
+<path d="M56.7253 16.6827C56.8245 16.3819 56.8392 16.0597 56.7677 15.7512C56.6962 15.4427 56.5413 15.1598 56.3199 14.9333C56.5381 14.6607 56.6584 14.3225 56.6613 13.9733C56.6853 13.5641 56.5631 13.1596 56.3164 12.8321C56.0697 12.5047 55.7146 12.2757 55.3145 12.1859C54.9145 12.0962 54.4956 12.1516 54.1327 12.3422C53.7697 12.5329 53.4864 12.8464 53.3333 13.2267C53.1139 13.1384 52.8789 13.0956 52.6424 13.1007C52.406 13.1059 52.1731 13.1589 51.9577 13.2566C51.7424 13.3543 51.5491 13.4947 51.3895 13.6692C51.2299 13.8437 51.1074 14.0488 51.0293 14.272C50.8244 14.1947 50.6082 14.1514 50.3893 14.144C49.9661 14.1466 49.5585 14.3044 49.2439 14.5876C48.9294 14.8707 48.7296 15.2594 48.6826 15.68H48.4053C47.9393 15.68 47.4922 15.8636 47.1607 16.191C46.8293 16.5185 46.6402 16.9634 46.6346 17.4293C46.6475 17.597 46.6834 17.7621 46.7413 17.92C46.5021 17.8015 46.2401 17.736 45.9733 17.728C45.5477 17.73 45.1375 17.8871 44.8194 18.1698C44.5013 18.4526 44.2972 18.8416 44.2453 19.264C43.9526 19.0348 43.593 18.9075 43.2213 18.9013C42.7891 18.9045 42.3734 19.0676 42.0544 19.3591C41.7353 19.6506 41.5354 20.0499 41.4933 20.48C41.3365 20.2709 41.1338 20.1006 40.9007 19.9822C40.6677 19.8639 40.4106 19.8006 40.1493 19.7973C39.7936 19.799 39.4466 19.9078 39.1536 20.1094C38.8606 20.3111 38.6352 20.5963 38.5066 20.928C38.207 20.6791 37.8295 20.5432 37.4399 20.544C37.1761 20.5502 36.917 20.6147 36.681 20.7327C36.4449 20.8507 36.2379 21.0194 36.0746 21.2267C35.9253 20.9808 35.7156 20.7772 35.4654 20.6353C35.2153 20.4934 34.9329 20.4179 34.6453 20.416C34.3803 20.416 34.119 20.4777 33.882 20.5962C33.6451 20.7147 33.4389 20.8867 33.2799 21.0987C33.1349 20.8162 32.9148 20.5791 32.6438 20.4135C32.3729 20.2479 32.0615 20.1602 31.7439 20.16C31.3799 20.1634 31.0259 20.2804 30.7315 20.4945C30.437 20.7087 30.2167 21.0093 30.1013 21.3547C29.8606 21.2429 29.5986 21.1847 29.3333 21.184C29.077 21.1864 28.8247 21.2472 28.5955 21.3618C28.3663 21.4764 28.1663 21.6418 28.0106 21.8453C27.8109 21.6437 27.5651 21.4938 27.2945 21.4083C27.0239 21.3229 26.7365 21.3046 26.4573 21.355C26.178 21.4054 25.9152 21.523 25.6915 21.6976C25.4678 21.8722 25.29 22.0986 25.1733 22.3573C25.0476 22.0297 24.8252 21.748 24.5356 21.5498C24.246 21.3517 23.9029 21.2464 23.5519 21.248C23.1231 21.2506 22.7102 21.4107 22.3916 21.6978C22.073 21.9849 21.871 22.3791 21.8239 22.8053C21.6734 22.7475 21.5154 22.7116 21.3546 22.6987C20.8907 22.6987 20.4457 22.883 20.1176 23.211C19.7896 23.5391 19.6053 23.984 19.6053 24.448C19.573 24.6315 19.573 24.8192 19.6053 25.0027C19.4022 24.9192 19.1849 24.8758 18.9653 24.8747C18.5013 24.8747 18.0564 25.059 17.7283 25.387C17.4003 25.7151 17.2159 26.16 17.2159 26.624C17.2204 26.9695 17.3322 27.305 17.5359 27.584C17.07 27.584 16.6228 27.7676 16.2914 28.095C15.9599 28.4225 15.7709 28.8674 15.7653 29.3333C15.7727 29.5522 15.816 29.7684 15.8933 29.9733C15.4841 29.979 15.0902 30.1296 14.7817 30.3985C14.4732 30.6674 14.2701 31.0371 14.2087 31.4417C14.1472 31.8462 14.2314 32.2595 14.4461 32.6079C14.6608 32.9563 14.9922 33.2171 15.3813 33.344C14.841 34.1044 14.5502 35.0139 14.5493 35.9467C14.5497 36.638 14.7181 37.3188 15.0399 37.9307C16.3138 36.2898 17.704 34.7427 19.1999 33.3013C19.2776 32.4843 19.5246 31.6923 19.9253 30.976C19.8386 30.4104 19.8386 29.8349 19.9253 29.2693C19.9849 28.8786 20.1468 28.5106 20.3946 28.2027C20.6339 27.9612 20.8288 27.6796 20.9706 27.3707C21.1133 26.9043 21.2133 26.4258 21.2693 25.9413C21.2814 26.4626 21.2457 26.9839 21.1626 27.4987C21.0653 27.7927 20.9052 28.0621 20.6933 28.288C20.4317 28.5768 20.274 28.9447 20.2453 29.3333C20.2206 29.6742 20.2206 30.0164 20.2453 30.3573C20.5948 29.8096 21.0798 29.3614 21.6533 29.056C22.1773 28.8062 22.6538 28.4669 23.0613 28.0533C23.7226 27.0507 24.7679 25.3227 24.7679 25.3227C24.418 26.3939 23.9828 27.4355 23.4666 28.4373C23.1123 28.9051 22.6611 29.2907 22.1439 29.568C21.4737 29.9006 20.9605 30.4827 20.7146 31.1893C20.5209 31.6139 20.3708 32.0571 20.2666 32.512C21.4614 31.4497 22.7463 30.4932 24.1066 29.6533C26.0528 28.4708 28.2402 27.7417 30.5066 27.52H31.1679C31.3086 27.1612 31.4725 26.8121 31.6586 26.4747C31.8979 26.0192 32.2699 25.6473 32.7253 25.408L33.5999 24.832C34.0504 24.3162 34.4175 23.7332 34.6879 23.104C34.5363 23.7108 34.3143 24.2979 34.0266 24.8533C33.75 25.1879 33.4091 25.4636 33.0239 25.664C32.5822 25.877 32.2387 26.2511 32.0639 26.7093C32.0639 26.9867 31.8933 27.2213 31.8293 27.456H31.9999C33.8975 27.3953 35.7875 27.1885 37.6533 26.8373C38.9033 26.5344 40.1032 26.053 41.2159 25.408C41.6723 24.6585 42.1859 23.9452 42.7519 23.2747C43.2953 22.8402 43.9084 22.5011 44.5653 22.272C44.0624 22.5375 43.5963 22.8674 43.1786 23.2533C42.7966 23.7571 42.5142 24.3291 42.3466 24.9387C44.7307 23.8165 46.9842 22.4358 49.0666 20.8213C49.0666 20.8213 41.7919 28.2667 32.8106 28.5227H31.9786C32.2812 28.7245 32.5945 28.9096 32.9173 29.0773C33.5876 29.381 34.3446 29.434 35.0506 29.2267C35.4133 29.0987 36.0746 28.6933 36.5866 28.8427C37.4794 28.9569 38.386 28.8009 39.1893 28.3947C39.1893 28.3947 37.5679 29.568 36.5439 29.248C36.1599 29.1413 35.3706 29.6747 35.0293 29.76C34.2732 30.0032 33.46 30.0032 32.7039 29.76C32.0407 29.4704 31.4171 29.0976 30.8479 28.6507C28.5194 28.8196 26.2927 29.6731 24.4479 31.104C23.1893 32.064 22.1013 32.896 21.1413 33.728C21.7274 33.8944 22.327 34.0086 22.9333 34.0693C23.7368 34.1403 24.5391 33.9208 25.1946 33.4507C25.4719 33.1947 25.8559 32.576 26.3679 32.512C27.4346 32.4053 28.5013 30.9973 28.5013 30.9973C28.5013 30.9973 27.5839 32.7467 26.5173 32.8533C26.1119 32.8533 25.5786 33.8347 25.3013 34.048C24.7059 34.4564 23.9963 34.6656 23.2746 34.6453C22.3427 34.6648 21.4136 34.5352 20.5226 34.2613C18.818 35.6488 17.3359 37.2891 16.1279 39.1253C16.8906 39.8032 17.861 40.2019 18.8799 40.256C18.8799 40.6304 18.954 41.0011 19.0979 41.3467C19.2419 41.6924 19.4528 42.0061 19.7185 42.2699C19.9842 42.5336 20.2996 42.7422 20.6463 42.8835C20.993 43.0248 21.3642 43.0961 21.7386 43.0933C22.2071 43.0888 22.6671 42.9674 23.0769 42.7401C23.4867 42.5129 23.8333 42.187 24.0853 41.792C24.4556 41.9542 24.8544 42.0412 25.2586 42.048C25.8279 42.0466 26.3837 41.8753 26.855 41.5561C27.3263 41.2368 27.6915 40.7841 27.9039 40.256C28.2037 40.3727 28.5211 40.4377 28.8426 40.448C29.6064 40.448 30.339 40.1446 30.8791 39.6045C31.4192 39.0644 31.7226 38.3318 31.7226 37.568C31.7125 37.139 31.6106 36.7171 31.4239 36.3307C31.7496 36.1686 32.0238 35.9191 32.2159 35.6102C32.408 35.3013 32.5105 34.9451 32.5119 34.5813C32.5219 34.482 32.5219 34.382 32.5119 34.2827C32.6184 34.2927 32.7255 34.2927 32.8319 34.2827C33.3361 34.2887 33.8227 34.0984 34.189 33.752C34.5553 33.4056 34.7725 32.9303 34.7946 32.4267C35.1264 32.6795 35.5295 32.8214 35.9466 32.832C36.3901 32.8281 36.8192 32.6742 37.1639 32.3953C37.5087 32.1164 37.7489 31.7289 37.8453 31.296C37.9936 31.5617 38.2103 31.7829 38.4729 31.9367C38.7354 32.0904 39.0343 32.1712 39.3386 32.1707C39.7708 32.1675 40.1865 32.0044 40.5055 31.7129C40.8246 31.4214 41.0245 31.0221 41.0666 30.592C41.2367 30.6126 41.4086 30.6126 41.5786 30.592C41.8846 30.5882 42.184 30.5033 42.4464 30.3459C42.7088 30.1884 42.9247 29.9642 43.0719 29.696C43.3734 29.9418 43.7497 30.0773 44.1386 30.08C44.5237 30.0765 44.8966 29.9444 45.198 29.7048C45.4995 29.4652 45.7123 29.1317 45.8026 28.7573C46.0045 28.8447 46.2226 28.8883 46.4426 28.8853C46.6723 28.8853 46.8998 28.8401 47.1121 28.7522C47.3243 28.6643 47.5171 28.5354 47.6796 28.373C47.842 28.2105 47.9709 28.0177 48.0588 27.8054C48.1467 27.5932 48.1919 27.3657 48.1919 27.136C48.2143 26.9589 48.2143 26.7797 48.1919 26.6027C48.3754 26.635 48.5631 26.635 48.7466 26.6027C49.1927 26.6035 49.6222 26.4339 49.9473 26.1286C50.2725 25.8232 50.4687 25.4052 50.4959 24.96C50.6308 24.9719 50.7664 24.9719 50.9013 24.96C51.3652 24.96 51.8102 24.7757 52.1382 24.4476C52.4663 24.1196 52.6506 23.6746 52.6506 23.2107C53.0578 23.1453 53.4287 22.9382 53.6981 22.626C53.9674 22.3137 54.1178 21.9163 54.1226 21.504C54.1226 21.504 54.1226 21.376 54.1226 21.312C54.5027 21.2293 54.8432 21.0193 55.0876 20.7167C55.3321 20.414 55.4658 20.037 55.4666 19.648C55.5365 19.5012 55.6005 19.3518 55.6586 19.2C55.856 19.0119 56.0027 18.7771 56.0853 18.5173C56.1488 18.2508 56.1488 17.9732 56.0853 17.7067C56.0853 17.7067 56.0853 17.536 56.0853 17.4507C56.3696 17.2633 56.5923 16.9961 56.7253 16.6827Z" />
+<path d="M47.3814 34.816C46.1232 33.5749 44.5764 32.6659 42.88 32.1707C42.8448 32.6635 42.6577 33.1333 42.3444 33.5153C42.0311 33.8974 41.6071 34.1729 41.1307 34.304C40.8452 34.3256 40.5584 34.2895 40.2871 34.1978C40.0159 34.1062 39.7659 33.9609 39.552 33.7707C39.4454 35.1573 37.632 35.392 36.608 35.0507H36.16C36.1722 35.1855 36.1722 35.3212 36.16 35.456C36.1477 35.9458 35.9995 36.4226 35.7321 36.8332C35.4647 37.2438 35.0884 37.572 34.6454 37.7813C34.9112 38.2881 35.0503 38.8517 35.0507 39.424C35.0396 39.9339 34.9282 40.4366 34.7227 40.9035C34.5173 41.3703 34.2219 41.7921 33.8534 42.1447C33.4849 42.4974 33.0506 42.774 32.5752 42.9587C32.0998 43.1434 31.5926 43.2327 31.0827 43.2213C30.6304 43.2124 30.183 43.1258 29.76 42.9653C29.4549 43.683 28.943 44.2936 28.2895 44.7192C27.6359 45.1447 26.8705 45.3659 26.0907 45.3547C25.5326 45.3531 24.9807 45.2369 24.4694 45.0133C24.1072 45.547 23.6211 45.985 23.0526 46.2897C22.4842 46.5943 21.8503 46.7566 21.2054 46.7627C20.6955 46.774 20.1883 46.6847 19.7129 46.5C19.2375 46.3153 18.8031 46.0387 18.4346 45.6861C18.0662 45.3334 17.7708 44.9116 17.5653 44.4448C17.3599 43.978 17.2484 43.4752 17.2374 42.9653C15.6863 42.9434 14.2045 42.3189 13.1056 41.224C12.0068 40.1291 11.3769 38.6497 11.3494 37.0987C11.3524 35.8594 11.7566 34.6545 12.5014 33.664C12.0633 33.5862 11.6606 33.3734 11.3494 33.0554C11.0383 32.7374 10.8344 32.3301 10.7662 31.8904C10.698 31.4508 10.769 31.0009 10.9692 30.6035C11.1694 30.2062 11.4888 29.8815 11.8827 29.6747C11.8827 29.504 11.8827 29.3333 11.8827 29.1627C11.8389 28.4897 11.9553 27.8159 12.2223 27.1966C12.4893 26.5774 12.8993 26.0302 13.4187 25.6C13.6463 25.4012 13.906 25.2425 14.1867 25.1307C13.2694 25.1307 12.0534 24.064 11.456 22.4853C11.1072 21.933 10.9221 21.2932 10.9221 20.64C10.9221 19.9868 11.1072 19.347 11.456 18.7947C10.2529 19.1333 9.14834 19.7551 8.2347 20.608C7.17483 21.7972 6.35985 23.1837 5.83638 24.6883C5.31291 26.1928 5.09123 27.7857 5.18403 29.376C5.10014 32.5752 5.65924 35.7588 6.82821 38.738C7.99717 41.7172 9.75222 44.4315 11.9894 46.72C14.0899 48.8329 16.9065 50.0813 19.8827 50.2187H20.1814C28.1387 50.3893 31.68 45.952 34.24 42.56C36.3734 39.7227 37.3974 38.6987 39.488 38.6987C44.608 38.6987 44.6507 47.936 44.6507 48.4053C44.6984 48.8359 44.8308 49.2528 45.0402 49.632C45.2496 50.0112 45.532 50.3453 45.8711 50.615C46.2101 50.8846 46.5992 51.0846 47.0158 51.2033C47.4324 51.322 47.8684 51.3571 48.2987 51.3067C51.392 51.3067 51.9894 49.1733 51.9894 48.512C51.9894 47.8507 52.2027 39.5947 47.3814 34.816Z" />
+<path d="M15.3036 24.4848C16.184 24.1164 16.3445 22.4961 15.6622 20.8658C14.9799 19.2355 13.7132 18.2126 12.8328 18.581C11.9524 18.9494 11.7919 20.5697 12.4742 22.2C13.1565 23.8303 14.4233 24.8533 15.3036 24.4848Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_346">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-pelvis.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-pelvis.svg
index 2d1843186..bbf34ba10 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-pelvis.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-pelvis.svg
@@ -1,12 +1,12 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_352)">
-<path d="M23.0198 19.1899C23.0198 19.1899 21.4922 19.7637 21.3564 21.2996C21.2207 22.8354 21.7808 26.0928 22.239 27.1392C22.6973 28.1857 22.7652 28.5063 22.4936 28.8776C22.2221 29.249 21.7299 30.1097 21.5771 31.4768C21.4243 32.8439 21.5262 33.7384 22.1712 34.8354C22.8161 35.9325 24.7511 37.5865 25.4809 38.0591C26.2108 38.5317 26.3805 38.7848 27.1443 38.9198C27.9081 39.0549 32.1514 39.7806 32.1514 39.9662C32.1514 40.1519 32.0325 42.2785 32.1514 42.4473C32.2702 42.616 32.5417 42.3966 32.372 43.1392C32.2023 43.8819 31.3197 44.6076 30.2673 44.7257C29.215 44.8439 29.4187 45.9409 27.8741 46.5317C26.3296 47.1224 24.3607 48.4895 22.6973 47.7975C21.034 47.1055 21.0849 46.4304 20.8982 45.8565C20.7115 45.2827 21.0849 43.6625 20.2871 42.5823C19.4894 41.5021 18.3861 40.135 18.505 39.4768C18.6238 38.8186 18.6407 38.4979 19.3366 39.0042C20.0325 39.5106 22.9689 40.3713 22.9689 40.3713C22.9689 40.3713 22.0693 43.3418 23.8854 44.135C25.7016 44.9283 27.7383 44.2363 28.2475 43.7806C28.7567 43.3249 29.6733 42.5992 29.4187 42.0422C29.1641 41.4852 29.2489 40.962 27.3649 40.5401C25.4809 40.1181 23.2744 40.3544 21.2885 39.4093C19.3027 38.4641 17.232 37.3671 16.7737 36.1688C16.3154 34.9705 16.1627 33.0802 15.8402 32C15.5177 30.9198 14.2787 28.8776 13.5488 28.6414C12.819 28.4051 10.6294 28.3207 10.1202 27.4093C9.61104 26.4979 8.74541 24.2194 9.08487 21.8228C9.42434 19.4262 9.81472 17.1983 11.3253 16.4557C12.8359 15.7131 15.6704 16 17.86 16.3882C20.0495 16.7764 20.8642 17.3165 21.4922 17.7722C22.1202 18.2279 23.0538 18.8354 23.0198 19.1899Z" fill="white"/>
-<path d="M42.9802 19.1899C42.9802 19.1899 44.5078 19.7637 44.6436 21.2996C44.7794 22.8354 44.2193 26.0928 43.761 27.1392C43.3027 28.1857 43.2348 28.5063 43.5064 28.8776C43.778 29.2489 44.2702 30.1097 44.423 31.4768C44.5757 32.8439 44.4739 33.7384 43.8289 34.8354C43.1839 35.9325 41.249 37.5865 40.5191 38.0591C39.7893 38.5316 39.6196 38.7848 38.8558 38.9198C38.092 39.0549 33.8487 39.7806 33.8487 39.9662C33.8487 40.1519 33.9675 42.2785 33.8487 42.4473C33.7299 42.616 33.4583 42.3966 33.628 43.1392C33.7978 43.8819 34.6804 44.6076 35.7327 44.7257C36.785 44.8439 36.5814 45.9409 38.1259 46.5316C39.6705 47.1224 41.6394 48.4895 43.3027 47.7975C44.9661 47.1055 44.9152 46.4304 45.1019 45.8565C45.2886 45.2827 44.9152 43.6624 45.7129 42.5823C46.5106 41.5021 47.6139 40.135 47.4951 39.4768C47.3763 38.8186 47.3593 38.4979 46.6634 39.0042C45.9675 39.5106 43.0312 40.3713 43.0312 40.3713C43.0312 40.3713 43.9307 43.3418 42.1146 44.135C40.2985 44.9283 38.2617 44.2363 37.7525 43.7806C37.2433 43.3249 36.3268 42.5992 36.5814 42.0422C36.836 41.4852 36.7511 40.962 38.6351 40.5401C40.5191 40.1181 42.7256 40.3544 44.7115 39.4093C46.6974 38.4641 48.7681 37.3671 49.2263 36.1688C49.6846 34.9705 49.8374 33.0802 50.1599 32C50.4824 30.9198 51.7214 28.8776 52.4512 28.6414C53.1811 28.4051 55.3706 28.3207 55.8798 27.4093C56.389 26.4979 57.2377 24.2025 56.8982 21.789C56.5587 19.3755 56.1684 17.1646 54.6408 16.4388C53.1132 15.7131 50.2957 15.9662 48.1061 16.3713C45.9166 16.7764 45.1019 17.2996 44.4739 17.7553C43.8459 18.211 42.9123 18.8186 42.9463 19.173L42.9802 19.1899Z" fill="white"/>
-<path d="M24.2249 19.3249C24.2249 19.3249 23.7327 19.2067 23.4271 19.9325C23.1216 20.6582 22.3409 22.1097 22.4766 23.8143C22.6124 25.519 23.3423 26.8354 23.1895 27.8312C23.0368 28.827 22.867 29.3333 22.6803 29.4515C22.4936 29.5696 22.1881 29.9409 23.0537 30.1435C23.9194 30.346 24.4286 29.9747 24.802 29.7553C25.1754 29.5359 26.041 29.6709 26.669 30.7342C27.297 31.7975 28.3833 34.4641 29.3168 34.7173C30.2503 34.9705 31.6591 34.8861 31.7779 35.5612C31.8967 36.2363 31.3706 36.4894 31.3027 36.5232C31.2348 36.557 30.2164 36.8608 30.3352 37.2321C30.454 37.6034 31.4045 37.789 31.6082 38.3797C31.8119 38.9705 32.1853 39.2911 32.4399 39.5949C32.6945 39.8987 32.389 41.9747 32.6266 42.0591C32.8642 42.1435 33.4922 42.2616 33.594 41.8903C33.6959 41.519 33.3394 39.6962 33.594 39.6287C33.8486 39.5612 34.3069 39.1224 34.4597 38.7173C34.6124 38.3122 34.9689 37.8565 35.6478 37.6034C36.3267 37.3502 35.6138 36.9114 34.867 36.4895C34.1202 36.0675 34.2051 35.3924 34.6803 35.2067C35.1556 35.0211 36.785 35.1055 37.4469 34.1772C38.1089 33.2489 39.0424 30.8523 39.7044 30.1941C40.3663 29.5359 41.0622 29.3671 41.6563 29.9409C42.2503 30.5148 43.3706 30.1435 43.3875 29.9409C43.4045 29.7384 42.2673 27.7975 42.4031 27.0886C42.5389 26.3797 43.2857 24.1181 43.2348 23.173C43.1839 22.2278 42.8614 19.8987 42.3691 19.4768C41.8769 19.0548 41.1641 20.135 40.3154 20.7426C39.4667 21.3502 38.9066 21.9578 37.1245 21.4177C35.3423 20.8776 34.1032 21.097 32.6775 21.0464C31.2517 20.9958 28.57 21.5527 27.942 21.519C27.314 21.4852 25.7694 20.692 25.2602 20.2194C24.751 19.7468 24.6492 19.4937 24.2418 19.3249H24.2249Z" fill="white"/>
+<path d="M23.0198 19.1899C23.0198 19.1899 21.4922 19.7637 21.3564 21.2996C21.2207 22.8354 21.7808 26.0928 22.239 27.1392C22.6973 28.1857 22.7652 28.5063 22.4936 28.8776C22.2221 29.249 21.7299 30.1097 21.5771 31.4768C21.4243 32.8439 21.5262 33.7384 22.1712 34.8354C22.8161 35.9325 24.7511 37.5865 25.4809 38.0591C26.2108 38.5317 26.3805 38.7848 27.1443 38.9198C27.9081 39.0549 32.1514 39.7806 32.1514 39.9662C32.1514 40.1519 32.0325 42.2785 32.1514 42.4473C32.2702 42.616 32.5417 42.3966 32.372 43.1392C32.2023 43.8819 31.3197 44.6076 30.2673 44.7257C29.215 44.8439 29.4187 45.9409 27.8741 46.5317C26.3296 47.1224 24.3607 48.4895 22.6973 47.7975C21.034 47.1055 21.0849 46.4304 20.8982 45.8565C20.7115 45.2827 21.0849 43.6625 20.2871 42.5823C19.4894 41.5021 18.3861 40.135 18.505 39.4768C18.6238 38.8186 18.6407 38.4979 19.3366 39.0042C20.0325 39.5106 22.9689 40.3713 22.9689 40.3713C22.9689 40.3713 22.0693 43.3418 23.8854 44.135C25.7016 44.9283 27.7383 44.2363 28.2475 43.7806C28.7567 43.3249 29.6733 42.5992 29.4187 42.0422C29.1641 41.4852 29.2489 40.962 27.3649 40.5401C25.4809 40.1181 23.2744 40.3544 21.2885 39.4093C19.3027 38.4641 17.232 37.3671 16.7737 36.1688C16.3154 34.9705 16.1627 33.0802 15.8402 32C15.5177 30.9198 14.2787 28.8776 13.5488 28.6414C12.819 28.4051 10.6294 28.3207 10.1202 27.4093C9.61104 26.4979 8.74541 24.2194 9.08487 21.8228C9.42434 19.4262 9.81472 17.1983 11.3253 16.4557C12.8359 15.7131 15.6704 16 17.86 16.3882C20.0495 16.7764 20.8642 17.3165 21.4922 17.7722C22.1202 18.2279 23.0538 18.8354 23.0198 19.1899Z" />
+<path d="M42.9802 19.1899C42.9802 19.1899 44.5078 19.7637 44.6436 21.2996C44.7794 22.8354 44.2193 26.0928 43.761 27.1392C43.3027 28.1857 43.2348 28.5063 43.5064 28.8776C43.778 29.2489 44.2702 30.1097 44.423 31.4768C44.5757 32.8439 44.4739 33.7384 43.8289 34.8354C43.1839 35.9325 41.249 37.5865 40.5191 38.0591C39.7893 38.5316 39.6196 38.7848 38.8558 38.9198C38.092 39.0549 33.8487 39.7806 33.8487 39.9662C33.8487 40.1519 33.9675 42.2785 33.8487 42.4473C33.7299 42.616 33.4583 42.3966 33.628 43.1392C33.7978 43.8819 34.6804 44.6076 35.7327 44.7257C36.785 44.8439 36.5814 45.9409 38.1259 46.5316C39.6705 47.1224 41.6394 48.4895 43.3027 47.7975C44.9661 47.1055 44.9152 46.4304 45.1019 45.8565C45.2886 45.2827 44.9152 43.6624 45.7129 42.5823C46.5106 41.5021 47.6139 40.135 47.4951 39.4768C47.3763 38.8186 47.3593 38.4979 46.6634 39.0042C45.9675 39.5106 43.0312 40.3713 43.0312 40.3713C43.0312 40.3713 43.9307 43.3418 42.1146 44.135C40.2985 44.9283 38.2617 44.2363 37.7525 43.7806C37.2433 43.3249 36.3268 42.5992 36.5814 42.0422C36.836 41.4852 36.7511 40.962 38.6351 40.5401C40.5191 40.1181 42.7256 40.3544 44.7115 39.4093C46.6974 38.4641 48.7681 37.3671 49.2263 36.1688C49.6846 34.9705 49.8374 33.0802 50.1599 32C50.4824 30.9198 51.7214 28.8776 52.4512 28.6414C53.1811 28.4051 55.3706 28.3207 55.8798 27.4093C56.389 26.4979 57.2377 24.2025 56.8982 21.789C56.5587 19.3755 56.1684 17.1646 54.6408 16.4388C53.1132 15.7131 50.2957 15.9662 48.1061 16.3713C45.9166 16.7764 45.1019 17.2996 44.4739 17.7553C43.8459 18.211 42.9123 18.8186 42.9463 19.173L42.9802 19.1899Z" />
+<path d="M24.2249 19.3249C24.2249 19.3249 23.7327 19.2067 23.4271 19.9325C23.1216 20.6582 22.3409 22.1097 22.4766 23.8143C22.6124 25.519 23.3423 26.8354 23.1895 27.8312C23.0368 28.827 22.867 29.3333 22.6803 29.4515C22.4936 29.5696 22.1881 29.9409 23.0537 30.1435C23.9194 30.346 24.4286 29.9747 24.802 29.7553C25.1754 29.5359 26.041 29.6709 26.669 30.7342C27.297 31.7975 28.3833 34.4641 29.3168 34.7173C30.2503 34.9705 31.6591 34.8861 31.7779 35.5612C31.8967 36.2363 31.3706 36.4894 31.3027 36.5232C31.2348 36.557 30.2164 36.8608 30.3352 37.2321C30.454 37.6034 31.4045 37.789 31.6082 38.3797C31.8119 38.9705 32.1853 39.2911 32.4399 39.5949C32.6945 39.8987 32.389 41.9747 32.6266 42.0591C32.8642 42.1435 33.4922 42.2616 33.594 41.8903C33.6959 41.519 33.3394 39.6962 33.594 39.6287C33.8486 39.5612 34.3069 39.1224 34.4597 38.7173C34.6124 38.3122 34.9689 37.8565 35.6478 37.6034C36.3267 37.3502 35.6138 36.9114 34.867 36.4895C34.1202 36.0675 34.2051 35.3924 34.6803 35.2067C35.1556 35.0211 36.785 35.1055 37.4469 34.1772C38.1089 33.2489 39.0424 30.8523 39.7044 30.1941C40.3663 29.5359 41.0622 29.3671 41.6563 29.9409C42.2503 30.5148 43.3706 30.1435 43.3875 29.9409C43.4045 29.7384 42.2673 27.7975 42.4031 27.0886C42.5389 26.3797 43.2857 24.1181 43.2348 23.173C43.1839 22.2278 42.8614 19.8987 42.3691 19.4768C41.8769 19.0548 41.1641 20.135 40.3154 20.7426C39.4667 21.3502 38.9066 21.9578 37.1245 21.4177C35.3423 20.8776 34.1032 21.097 32.6775 21.0464C31.2517 20.9958 28.57 21.5527 27.942 21.519C27.314 21.4852 25.7694 20.692 25.2602 20.2194C24.751 19.7468 24.6492 19.4937 24.2418 19.3249H24.2249Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_352">
-<rect width="48" height="32" fill="white" transform="translate(9 16)"/>
+<rect width="48" height="32"  transform="translate(9 16)"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-peripheral-nervous-system.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-peripheral-nervous-system.svg
index 58a2a0267..604fb657b 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-peripheral-nervous-system.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-peripheral-nervous-system.svg
@@ -1,4 +1,4 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <path d="M53.312 59.2L51.7546 61.8666" stroke="white" stroke-width="0.75" stroke-miterlimit="10" stroke-linecap="round"/>
 <path d="M27.8613 25.6C41.088 29.5467 40.1707 32 42.7947 34.816C46.2293 38.5067 46.016 40.8747 48.256 46.6773C49.408 49.664 49.8987 60.3307 57.664 61.0133" stroke="white" stroke-width="0.75" stroke-miterlimit="10" stroke-linecap="round"/>
 <path d="M57.6 55.744L51.7546 57.2373" stroke="white" stroke-width="0.75" stroke-miterlimit="10" stroke-linecap="round"/>
@@ -14,6 +14,6 @@
 <path d="M36.8426 15.296L36.5439 11.8186" stroke="white" stroke-width="0.75" stroke-miterlimit="10" stroke-linecap="round"/>
 <path d="M23.616 33.4933C23.616 33.4933 27.7333 37.0347 27.7333 39.2747C27.9191 40.8524 28.573 42.3384 29.6106 43.5413" stroke="white" stroke-width="0.75" stroke-miterlimit="10" stroke-linecap="round"/>
 <path d="M27.4347 40.512L22.2933 42.688" stroke="white" stroke-width="0.75" stroke-miterlimit="10" stroke-linecap="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7494 35.648C22.3574 32.4053 15.6161 31.6587 11.1574 32.6827C11.9544 30.6738 12.2142 28.492 11.9112 26.3522C11.6082 24.2125 10.7528 22.1885 9.42944 20.48C15.428 19.7817 18.7212 16.9942 21.3528 14.7668C21.8565 14.3405 22.3359 13.9347 22.8054 13.568C24.1704 17.8644 26.1555 17.7628 28.6871 17.6332C29.6375 17.5846 30.6649 17.532 31.7654 17.7067C30.5281 18.9653 27.1574 22.4 29.6321 26.0693C27.8614 26.7947 27.0294 27.4773 26.4961 28.928C25.6494 31.0606 25.3915 33.3816 25.7494 35.648ZM21.6485 22.9949C21.2587 22.2465 20.6186 21.6585 19.8399 21.3333C19.0127 21.1484 18.1466 21.2662 17.3989 21.6655C16.6513 22.0648 16.0716 22.719 15.7652 23.5093C15.2532 25.2373 15.7866 27.008 17.0666 27.3707C18.3466 27.7333 21.3332 27.2853 21.9732 25.4293C22.1532 24.6049 22.0383 23.7434 21.6485 22.9949Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7494 35.648C22.3574 32.4053 15.6161 31.6587 11.1574 32.6827C11.9544 30.6738 12.2142 28.492 11.9112 26.3522C11.6082 24.2125 10.7528 22.1885 9.42944 20.48C15.428 19.7817 18.7212 16.9942 21.3528 14.7668C21.8565 14.3405 22.3359 13.9347 22.8054 13.568C24.1704 17.8644 26.1555 17.7628 28.6871 17.6332C29.6375 17.5846 30.6649 17.532 31.7654 17.7067C30.5281 18.9653 27.1574 22.4 29.6321 26.0693C27.8614 26.7947 27.0294 27.4773 26.4961 28.928C25.6494 31.0606 25.3915 33.3816 25.7494 35.648ZM21.6485 22.9949C21.2587 22.2465 20.6186 21.6585 19.8399 21.3333C19.0127 21.1484 18.1466 21.2662 17.3989 21.6655C16.6513 22.0648 16.0716 22.719 15.7652 23.5093C15.2532 25.2373 15.7866 27.008 17.0666 27.3707C18.3466 27.7333 21.3332 27.2853 21.9732 25.4293C22.1532 24.6049 22.0383 23.7434 21.6485 22.9949Z" />
 <path d="M25.1093 41.4933C25.4416 42.3877 25.5035 43.3602 25.2873 44.2895C25.0711 45.2189 24.5863 46.0641 23.8933 46.72" stroke="white" stroke-width="0.75" stroke-miterlimit="10" stroke-linecap="round"/>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-placenta.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-placenta.svg
index 1041a0b69..b8de599d8 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-placenta.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-placenta.svg
@@ -1,11 +1,11 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_381)">
-<path d="M59.9824 29.0819C58.0533 18.4381 51.842 28.1791 37.6176 33.3646C37.8296 33.6795 38.0204 33.9944 38.2536 34.2883C38.7623 34.7922 38.7835 35.359 38.5927 35.9258C38.8047 36.0098 39.0167 36.0728 39.2711 36.1567C40.9882 33.3016 44.0408 31.4542 47.3903 31.2232C47.4539 31.2232 47.5387 31.2232 47.6022 31.2232C47.9202 31.2862 48.111 31.5801 48.0474 31.895C47.9838 32.2099 47.687 32.3989 47.3691 32.3359C44.5284 32.5668 41.9634 34.0994 40.4582 36.4926C41.1154 36.5976 41.7726 36.6606 42.4297 36.6606C44.9524 36.6606 47.4751 36.3877 49.9341 35.8418C50.2309 35.7579 50.5489 35.9258 50.6549 36.2197C50.6549 36.2197 50.6549 36.2407 50.6549 36.2617C50.7185 36.5556 50.5489 36.8495 50.2521 36.9125C49.4889 36.8285 48.747 36.8285 47.9838 36.9125C46.7755 37.1434 44.592 37.7733 43.7441 37.9202C43.2141 38.0252 42.6841 38.0882 42.1329 38.0882H41.5606C40.6278 38.1302 39.6951 38.0462 38.7835 37.8362C38.3808 37.7103 37.9568 37.5633 37.5752 37.3954C37.3208 37.6473 37.0664 37.8782 36.8332 38.0672C37.0452 38.3191 37.2572 38.571 37.5116 38.8019C39.8859 40.6914 41.1366 43.6095 40.8398 46.6116C40.8822 47.6613 40.9458 48.8369 41.1154 50.3065C41.1366 50.6214 40.9034 50.8943 40.5854 50.9153C40.2675 50.9363 39.9919 50.7264 39.9283 50.4115C39.6739 48.9209 39.6739 47.7243 39.6739 46.6536C39.6739 45.8348 39.5891 45.0161 39.4831 44.2183L39.0591 42.7278C38.7411 41.993 38.3172 41.3212 37.766 40.7334C37.5752 43.2106 36.6001 45.5409 34.9677 47.4304C34.7346 47.6403 34.3742 47.6403 34.141 47.4304C33.9926 47.3254 33.9078 47.1574 33.929 46.9685C33.929 46.8425 33.9714 46.7376 34.0562 46.6536C35.8157 44.6802 36.7484 42.1399 36.6637 39.5157C36.3033 39.2638 36.0065 38.9699 35.7309 38.655C35.0737 38.8649 34.4166 38.9489 33.7382 38.8229C32.6571 39.8096 31.8303 41.0483 31.3851 42.4339L30.8764 44.8061C30.834 45.5829 30.834 46.3807 30.8764 47.1574C30.7704 50.3905 31.0248 53.6235 31.6183 56.7935C31.7031 57.1294 31.4911 57.4653 31.1308 57.5493C30.8128 57.6123 30.516 57.4234 30.4312 57.1294V56.7726C29.8376 54.4632 29.456 52.112 29.2865 49.7397C29.0321 50.0966 28.7565 50.4325 28.4809 50.7894C28.2053 51.1462 27.9721 51.5451 27.7601 51.881C27.1878 52.8257 27.0394 55.5129 25.5343 55.7229C25.1951 55.7229 24.5803 55.7229 24.5379 55.366C24.4955 55.0091 25.0679 54.6732 25.3011 54.4213C25.9158 53.7914 26.149 52.1539 26.7002 51.2302L26.8274 51.0413C25.4707 50.8943 24.1139 51.1043 22.8844 51.6711C22.5876 51.818 22.206 51.6711 22.0577 51.3982C21.9093 51.0833 22.0365 50.7054 22.3544 50.5374C23.8384 49.8656 25.4707 49.6137 27.0818 49.8026H27.6329C28.2477 49.0049 28.8201 48.2281 29.2229 47.7033V46.1917C29.2229 45.184 29.3713 44.1973 29.668 43.2316C30.092 42.077 30.622 40.9643 31.2579 39.8936C30.3252 40.4185 29.456 41.0483 28.6717 41.7831C26.4034 44.1553 23.0964 45.268 19.8318 44.7852H15.592C15.2316 44.7852 14.956 44.5122 14.956 44.1553C14.956 43.7984 15.2316 43.5255 15.592 43.5255C17.0123 43.4626 18.4115 43.4626 19.8318 43.5255C20.8493 43.5255 23.4992 43.2106 23.4992 43.2106C24.6015 42.9167 25.6615 42.4549 26.6154 41.846C23.8808 41.4891 21.3581 40.2925 19.3442 38.4241C19.111 38.1721 19.111 37.7733 19.3442 37.5213C19.5986 37.2904 19.9802 37.2904 20.2346 37.5213C22.3544 39.5367 25.1527 40.6914 28.0993 40.7334C29.2653 39.6627 30.622 38.8229 32.0211 38.1301C31.8939 38.0462 31.7243 37.9832 31.6183 37.8572C31.4911 37.6473 31.6183 36.7446 31.3215 35.233L31.4911 35.128C31.4911 35.128 31.3851 35.149 31.3427 35.17C24.1351 36.6816 22.8208 35.254 9.88953 27.1924C2.23675 22.4269 1.74918 36.2617 4.58982 43.5465C7.74845 51.4612 10.6315 56.1427 18.9202 58.2421C25.0043 59.7117 35.6037 63.7005 41.9634 61.2022C47.5387 59.0399 50.6761 55.9328 55.7426 51.2302C61.9539 45.436 61.6147 38.0672 59.9824 29.0819Z" fill="white"/>
-<path d="M59.622 11.0693C58.9013 9.47374 58.5833 7.73127 58.6893 5.98879C58.7105 5.10705 58.3501 4.24631 57.7141 3.6375C55.785 2.37787 53.4744 1.81104 51.1849 2.06297C50.3793 2.06297 49.7222 2.71377 49.7222 3.51153C49.7222 3.51153 49.7222 3.53253 49.7222 3.55352C49.7222 4.35128 50.4005 4.9601 51.2061 4.9391C51.2273 4.9391 51.2697 4.9391 51.2909 4.9391C52.7536 4.77116 54.2163 5.02308 55.5307 5.69488V5.88382C55.4035 8.04617 55.8062 10.2085 56.6754 12.1819C57.0146 12.8327 57.1842 13.5465 57.2054 14.2813C57.163 16.1287 54.1103 17.2624 52.1812 17.2624C51.1849 17.2624 50.6549 16.4017 49.6586 14.5542C49.277 13.7775 48.853 13.0427 48.3654 12.3289C46.9027 10.7754 44.6557 10.2295 42.6206 10.9013C39.6739 11.5101 36.4517 13.5045 35.9005 16.5906C35.6885 17.7033 35.3282 17.8082 35.201 17.8502C34.5014 17.9342 33.7806 17.8922 33.0811 17.7243C32.2119 17.5143 31.3216 17.4094 30.4312 17.4304C30.1768 17.4304 30.1557 17.4304 30.0709 17.2624C29.7317 16.0448 29.8589 14.7432 30.4312 13.6095C32.2331 12.4549 31.8516 11.0903 31.682 10.7124C30.7704 8.48704 26.0219 7.92021 23.054 8.36108C20.3618 8.86493 17.9875 10.3555 16.3976 12.5598C16.016 13.0007 15.6133 13.4206 15.1893 13.8194C12.9846 15.352 12.3698 18.3121 13.7902 20.5794C14.4261 22.1329 14.8289 23.7705 14.9985 25.429C15.0409 26.5206 15.5921 27.5493 16.4824 28.2001C18.3055 29.5227 21.0402 29.0399 23.2236 28.662C23.7748 28.557 24.326 28.494 24.8771 28.4521C25.8099 28.4521 25.8523 28.557 26.2339 29.5017C26.5518 31.1183 27.845 32.3779 29.4773 32.6718C31.6396 33.1336 33.1235 35.1071 32.9963 37.2904C33.1235 38.0252 34.5438 37.7733 35.3494 37.6053C36.1549 37.4374 37.4692 36.3877 37.4692 35.6529C37.4692 35.4849 36.8121 32.2729 30.9824 30.1735H30.6644C29.5833 29.9006 29.4349 29.3968 29.0957 28.536C28.5657 26.7096 26.785 25.5129 24.8771 25.6599C24.114 25.6809 23.3508 25.7858 22.6089 25.9328C21.2521 26.1637 19.0051 26.5626 18.2419 25.9328C18.2419 25.9328 17.9875 25.7649 17.9451 25.219C17.7543 23.3086 17.288 21.4402 16.546 19.6557C15.804 17.6823 15.5921 17.2624 17.182 16.0028C17.6907 15.5199 18.1783 15.0161 18.6447 14.4702C19.7682 12.8117 21.4853 11.6571 23.4568 11.2162C25.0891 10.9853 26.7426 11.1113 28.3113 11.5731C26.9758 13.4625 26.5942 15.8558 27.2726 18.0602C27.7602 19.5717 29.2865 20.5164 30.8764 20.3065C31.47 20.3065 32.0635 20.3485 32.6359 20.4744C33.8018 20.7474 35.0314 20.7474 36.1973 20.4744C37.7236 19.9496 38.7836 18.585 38.9108 16.9895C39.2076 15.31 41.3274 14.0504 43.2777 13.6515C44.7192 13.3576 45.6732 13.6515 45.864 13.8614C46.2668 14.4702 46.6483 15.1001 46.9663 15.7509C47.9415 17.5983 49.0862 19.9496 52.0116 20.0756C55.7638 20.3065 60.1096 17.9762 60.364 14.4702C60.3852 13.2946 60.1308 12.119 59.622 11.0693Z" fill="white"/>
+<path d="M59.9824 29.0819C58.0533 18.4381 51.842 28.1791 37.6176 33.3646C37.8296 33.6795 38.0204 33.9944 38.2536 34.2883C38.7623 34.7922 38.7835 35.359 38.5927 35.9258C38.8047 36.0098 39.0167 36.0728 39.2711 36.1567C40.9882 33.3016 44.0408 31.4542 47.3903 31.2232C47.4539 31.2232 47.5387 31.2232 47.6022 31.2232C47.9202 31.2862 48.111 31.5801 48.0474 31.895C47.9838 32.2099 47.687 32.3989 47.3691 32.3359C44.5284 32.5668 41.9634 34.0994 40.4582 36.4926C41.1154 36.5976 41.7726 36.6606 42.4297 36.6606C44.9524 36.6606 47.4751 36.3877 49.9341 35.8418C50.2309 35.7579 50.5489 35.9258 50.6549 36.2197C50.6549 36.2197 50.6549 36.2407 50.6549 36.2617C50.7185 36.5556 50.5489 36.8495 50.2521 36.9125C49.4889 36.8285 48.747 36.8285 47.9838 36.9125C46.7755 37.1434 44.592 37.7733 43.7441 37.9202C43.2141 38.0252 42.6841 38.0882 42.1329 38.0882H41.5606C40.6278 38.1302 39.6951 38.0462 38.7835 37.8362C38.3808 37.7103 37.9568 37.5633 37.5752 37.3954C37.3208 37.6473 37.0664 37.8782 36.8332 38.0672C37.0452 38.3191 37.2572 38.571 37.5116 38.8019C39.8859 40.6914 41.1366 43.6095 40.8398 46.6116C40.8822 47.6613 40.9458 48.8369 41.1154 50.3065C41.1366 50.6214 40.9034 50.8943 40.5854 50.9153C40.2675 50.9363 39.9919 50.7264 39.9283 50.4115C39.6739 48.9209 39.6739 47.7243 39.6739 46.6536C39.6739 45.8348 39.5891 45.0161 39.4831 44.2183L39.0591 42.7278C38.7411 41.993 38.3172 41.3212 37.766 40.7334C37.5752 43.2106 36.6001 45.5409 34.9677 47.4304C34.7346 47.6403 34.3742 47.6403 34.141 47.4304C33.9926 47.3254 33.9078 47.1574 33.929 46.9685C33.929 46.8425 33.9714 46.7376 34.0562 46.6536C35.8157 44.6802 36.7484 42.1399 36.6637 39.5157C36.3033 39.2638 36.0065 38.9699 35.7309 38.655C35.0737 38.8649 34.4166 38.9489 33.7382 38.8229C32.6571 39.8096 31.8303 41.0483 31.3851 42.4339L30.8764 44.8061C30.834 45.5829 30.834 46.3807 30.8764 47.1574C30.7704 50.3905 31.0248 53.6235 31.6183 56.7935C31.7031 57.1294 31.4911 57.4653 31.1308 57.5493C30.8128 57.6123 30.516 57.4234 30.4312 57.1294V56.7726C29.8376 54.4632 29.456 52.112 29.2865 49.7397C29.0321 50.0966 28.7565 50.4325 28.4809 50.7894C28.2053 51.1462 27.9721 51.5451 27.7601 51.881C27.1878 52.8257 27.0394 55.5129 25.5343 55.7229C25.1951 55.7229 24.5803 55.7229 24.5379 55.366C24.4955 55.0091 25.0679 54.6732 25.3011 54.4213C25.9158 53.7914 26.149 52.1539 26.7002 51.2302L26.8274 51.0413C25.4707 50.8943 24.1139 51.1043 22.8844 51.6711C22.5876 51.818 22.206 51.6711 22.0577 51.3982C21.9093 51.0833 22.0365 50.7054 22.3544 50.5374C23.8384 49.8656 25.4707 49.6137 27.0818 49.8026H27.6329C28.2477 49.0049 28.8201 48.2281 29.2229 47.7033V46.1917C29.2229 45.184 29.3713 44.1973 29.668 43.2316C30.092 42.077 30.622 40.9643 31.2579 39.8936C30.3252 40.4185 29.456 41.0483 28.6717 41.7831C26.4034 44.1553 23.0964 45.268 19.8318 44.7852H15.592C15.2316 44.7852 14.956 44.5122 14.956 44.1553C14.956 43.7984 15.2316 43.5255 15.592 43.5255C17.0123 43.4626 18.4115 43.4626 19.8318 43.5255C20.8493 43.5255 23.4992 43.2106 23.4992 43.2106C24.6015 42.9167 25.6615 42.4549 26.6154 41.846C23.8808 41.4891 21.3581 40.2925 19.3442 38.4241C19.111 38.1721 19.111 37.7733 19.3442 37.5213C19.5986 37.2904 19.9802 37.2904 20.2346 37.5213C22.3544 39.5367 25.1527 40.6914 28.0993 40.7334C29.2653 39.6627 30.622 38.8229 32.0211 38.1301C31.8939 38.0462 31.7243 37.9832 31.6183 37.8572C31.4911 37.6473 31.6183 36.7446 31.3215 35.233L31.4911 35.128C31.4911 35.128 31.3851 35.149 31.3427 35.17C24.1351 36.6816 22.8208 35.254 9.88953 27.1924C2.23675 22.4269 1.74918 36.2617 4.58982 43.5465C7.74845 51.4612 10.6315 56.1427 18.9202 58.2421C25.0043 59.7117 35.6037 63.7005 41.9634 61.2022C47.5387 59.0399 50.6761 55.9328 55.7426 51.2302C61.9539 45.436 61.6147 38.0672 59.9824 29.0819Z" />
+<path d="M59.622 11.0693C58.9013 9.47374 58.5833 7.73127 58.6893 5.98879C58.7105 5.10705 58.3501 4.24631 57.7141 3.6375C55.785 2.37787 53.4744 1.81104 51.1849 2.06297C50.3793 2.06297 49.7222 2.71377 49.7222 3.51153C49.7222 3.51153 49.7222 3.53253 49.7222 3.55352C49.7222 4.35128 50.4005 4.9601 51.2061 4.9391C51.2273 4.9391 51.2697 4.9391 51.2909 4.9391C52.7536 4.77116 54.2163 5.02308 55.5307 5.69488V5.88382C55.4035 8.04617 55.8062 10.2085 56.6754 12.1819C57.0146 12.8327 57.1842 13.5465 57.2054 14.2813C57.163 16.1287 54.1103 17.2624 52.1812 17.2624C51.1849 17.2624 50.6549 16.4017 49.6586 14.5542C49.277 13.7775 48.853 13.0427 48.3654 12.3289C46.9027 10.7754 44.6557 10.2295 42.6206 10.9013C39.6739 11.5101 36.4517 13.5045 35.9005 16.5906C35.6885 17.7033 35.3282 17.8082 35.201 17.8502C34.5014 17.9342 33.7806 17.8922 33.0811 17.7243C32.2119 17.5143 31.3216 17.4094 30.4312 17.4304C30.1768 17.4304 30.1557 17.4304 30.0709 17.2624C29.7317 16.0448 29.8589 14.7432 30.4312 13.6095C32.2331 12.4549 31.8516 11.0903 31.682 10.7124C30.7704 8.48704 26.0219 7.92021 23.054 8.36108C20.3618 8.86493 17.9875 10.3555 16.3976 12.5598C16.016 13.0007 15.6133 13.4206 15.1893 13.8194C12.9846 15.352 12.3698 18.3121 13.7902 20.5794C14.4261 22.1329 14.8289 23.7705 14.9985 25.429C15.0409 26.5206 15.5921 27.5493 16.4824 28.2001C18.3055 29.5227 21.0402 29.0399 23.2236 28.662C23.7748 28.557 24.326 28.494 24.8771 28.4521C25.8099 28.4521 25.8523 28.557 26.2339 29.5017C26.5518 31.1183 27.845 32.3779 29.4773 32.6718C31.6396 33.1336 33.1235 35.1071 32.9963 37.2904C33.1235 38.0252 34.5438 37.7733 35.3494 37.6053C36.1549 37.4374 37.4692 36.3877 37.4692 35.6529C37.4692 35.4849 36.8121 32.2729 30.9824 30.1735H30.6644C29.5833 29.9006 29.4349 29.3968 29.0957 28.536C28.5657 26.7096 26.785 25.5129 24.8771 25.6599C24.114 25.6809 23.3508 25.7858 22.6089 25.9328C21.2521 26.1637 19.0051 26.5626 18.2419 25.9328C18.2419 25.9328 17.9875 25.7649 17.9451 25.219C17.7543 23.3086 17.288 21.4402 16.546 19.6557C15.804 17.6823 15.5921 17.2624 17.182 16.0028C17.6907 15.5199 18.1783 15.0161 18.6447 14.4702C19.7682 12.8117 21.4853 11.6571 23.4568 11.2162C25.0891 10.9853 26.7426 11.1113 28.3113 11.5731C26.9758 13.4625 26.5942 15.8558 27.2726 18.0602C27.7602 19.5717 29.2865 20.5164 30.8764 20.3065C31.47 20.3065 32.0635 20.3485 32.6359 20.4744C33.8018 20.7474 35.0314 20.7474 36.1973 20.4744C37.7236 19.9496 38.7836 18.585 38.9108 16.9895C39.2076 15.31 41.3274 14.0504 43.2777 13.6515C44.7192 13.3576 45.6732 13.6515 45.864 13.8614C46.2668 14.4702 46.6483 15.1001 46.9663 15.7509C47.9415 17.5983 49.0862 19.9496 52.0116 20.0756C55.7638 20.3065 60.1096 17.9762 60.364 14.4702C60.3852 13.2946 60.1308 12.119 59.622 11.0693Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_381">
-<rect width="58" height="60" fill="white" transform="translate(3 2)"/>
+<rect width="58" height="60"  transform="translate(3 2)"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-prostate.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-prostate.svg
index ce867f4a1..97801f141 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-prostate.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-prostate.svg
@@ -1,12 +1,12 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_388)">
-<path d="M35.627 55H29.1413V37.9579C29.1203 36.5675 28.3622 35.2615 27.1619 34.5242C19.4338 32.7968 14.0431 27.2986 14.0431 21.1475C14.0431 19.1884 14.5905 17.2714 15.5803 15.5861C15.475 14.6803 15.0749 13.8166 14.4431 13.1636L10 8.55019L14.5063 4L19.0969 8.61338C19.8339 9.30855 20.8236 9.72986 21.8554 9.75093C25.0983 8.06568 28.7623 7.22305 32.4052 7.26518C36.0271 7.20198 39.649 8.08674 42.8919 9.772C44.029 9.83519 45.1451 9.45601 45.9663 8.67658L50.4726 4.14746L55 8.71871L50.4305 13.2268C49.7777 13.9009 49.3776 14.7856 49.2934 15.7336C50.1357 17.3978 50.6411 19.2515 50.7043 21.1053C50.7043 26.6456 46.5559 31.5328 39.8596 33.8922C39.1437 34.145 38.4066 34.3556 37.6907 34.5242C36.4483 35.2615 35.6692 36.5886 35.6481 38.0421V55H35.627ZM31.2471 52.8934H33.5213V38.0211C33.5634 35.746 34.8269 33.7026 36.7852 32.6072L37.059 32.5019C37.7749 32.3544 38.4698 32.1437 39.1437 31.912C44.9766 29.8687 48.5985 25.7398 48.5985 21.1475C48.5353 19.5465 48.0721 17.9033 47.2929 16.4709L47.1666 16.2181V15.9442C47.2087 14.3643 47.8194 12.8686 48.9144 11.7311L52.0098 8.67658L50.4726 7.13879L47.4193 10.1933C46.0505 11.4572 44.2606 12.0471 42.4497 11.8364L42.0707 11.71C39.1015 10.1301 35.7113 9.26642 32.3842 9.35068C28.9097 9.35068 25.5826 10.109 22.5924 11.71L22.3818 11.8154H22.1292C20.4445 11.8996 18.8021 11.2466 17.6018 10.0669L14.5063 6.94919L12.9481 8.52912L15.9593 11.6679C17.0332 12.7844 17.6439 14.2379 17.7071 15.7757V16.0917L17.5386 16.3656C16.6331 17.798 16.1488 19.4411 16.1488 21.1264C16.1488 26.3296 20.9289 30.9851 27.7936 32.4808L28.0884 32.5861C29.9836 33.6815 31.205 35.7038 31.2471 37.8947V52.8513V52.8934Z" fill="white"/>
-<path d="M41.4179 35.3668C40.5124 35.0508 39.8175 34.9665 39.2279 35.0719C39.1015 35.114 38.9752 35.1561 38.8489 35.1772C37.6065 35.9145 36.8273 37.2416 36.8063 38.6952V52.9356C36.8063 52.9356 36.8905 52.9988 36.9326 53.0198C38.6593 53.6307 43.0814 50.6183 44.8292 45.6468C46.577 40.6753 45.4399 36.7993 41.4389 35.3668H41.4179Z" fill="white"/>
-<path d="M27.9199 38.6109C27.8989 37.2206 27.1408 35.9145 25.9405 35.1772C25.7931 35.1351 25.6247 35.0929 25.4773 35.0508C24.9298 35.0087 24.298 35.0508 23.4768 35.3668C19.4759 36.7993 18.3809 40.6753 20.1076 45.6468C21.8133 50.5341 26.2143 53.5043 27.8989 53.0198V38.6109H27.9199Z" fill="white"/>
+<path d="M35.627 55H29.1413V37.9579C29.1203 36.5675 28.3622 35.2615 27.1619 34.5242C19.4338 32.7968 14.0431 27.2986 14.0431 21.1475C14.0431 19.1884 14.5905 17.2714 15.5803 15.5861C15.475 14.6803 15.0749 13.8166 14.4431 13.1636L10 8.55019L14.5063 4L19.0969 8.61338C19.8339 9.30855 20.8236 9.72986 21.8554 9.75093C25.0983 8.06568 28.7623 7.22305 32.4052 7.26518C36.0271 7.20198 39.649 8.08674 42.8919 9.772C44.029 9.83519 45.1451 9.45601 45.9663 8.67658L50.4726 4.14746L55 8.71871L50.4305 13.2268C49.7777 13.9009 49.3776 14.7856 49.2934 15.7336C50.1357 17.3978 50.6411 19.2515 50.7043 21.1053C50.7043 26.6456 46.5559 31.5328 39.8596 33.8922C39.1437 34.145 38.4066 34.3556 37.6907 34.5242C36.4483 35.2615 35.6692 36.5886 35.6481 38.0421V55H35.627ZM31.2471 52.8934H33.5213V38.0211C33.5634 35.746 34.8269 33.7026 36.7852 32.6072L37.059 32.5019C37.7749 32.3544 38.4698 32.1437 39.1437 31.912C44.9766 29.8687 48.5985 25.7398 48.5985 21.1475C48.5353 19.5465 48.0721 17.9033 47.2929 16.4709L47.1666 16.2181V15.9442C47.2087 14.3643 47.8194 12.8686 48.9144 11.7311L52.0098 8.67658L50.4726 7.13879L47.4193 10.1933C46.0505 11.4572 44.2606 12.0471 42.4497 11.8364L42.0707 11.71C39.1015 10.1301 35.7113 9.26642 32.3842 9.35068C28.9097 9.35068 25.5826 10.109 22.5924 11.71L22.3818 11.8154H22.1292C20.4445 11.8996 18.8021 11.2466 17.6018 10.0669L14.5063 6.94919L12.9481 8.52912L15.9593 11.6679C17.0332 12.7844 17.6439 14.2379 17.7071 15.7757V16.0917L17.5386 16.3656C16.6331 17.798 16.1488 19.4411 16.1488 21.1264C16.1488 26.3296 20.9289 30.9851 27.7936 32.4808L28.0884 32.5861C29.9836 33.6815 31.205 35.7038 31.2471 37.8947V52.8513V52.8934Z" />
+<path d="M41.4179 35.3668C40.5124 35.0508 39.8175 34.9665 39.2279 35.0719C39.1015 35.114 38.9752 35.1561 38.8489 35.1772C37.6065 35.9145 36.8273 37.2416 36.8063 38.6952V52.9356C36.8063 52.9356 36.8905 52.9988 36.9326 53.0198C38.6593 53.6307 43.0814 50.6183 44.8292 45.6468C46.577 40.6753 45.4399 36.7993 41.4389 35.3668H41.4179Z" />
+<path d="M27.9199 38.6109C27.8989 37.2206 27.1408 35.9145 25.9405 35.1772C25.7931 35.1351 25.6247 35.0929 25.4773 35.0508C24.9298 35.0087 24.298 35.0508 23.4768 35.3668C19.4759 36.7993 18.3809 40.6753 20.1076 45.6468C21.8133 50.5341 26.2143 53.5043 27.8989 53.0198V38.6109H27.9199Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_388">
-<rect width="45" height="51" fill="white" transform="translate(10 4)"/>
+<rect width="45" height="51"  transform="translate(10 4)"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-skin.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-skin.svg
index edaaaa664..ad49855a7 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-skin.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-skin.svg
@@ -1,25 +1,25 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_393)">
-<path d="M21.44 48.2987C22.0291 48.2987 22.5066 47.8211 22.5066 47.232C22.5066 46.6429 22.0291 46.1653 21.44 46.1653C20.8509 46.1653 20.3733 46.6429 20.3733 47.232C20.3733 47.8211 20.8509 48.2987 21.44 48.2987Z" fill="white"/>
-<path d="M11.136 48.2987C11.7251 48.2987 12.2027 47.8211 12.2027 47.232C12.2027 46.6429 11.7251 46.1653 11.136 46.1653C10.5469 46.1653 10.0693 46.6429 10.0693 47.232C10.0693 47.8211 10.5469 48.2987 11.136 48.2987Z" fill="white"/>
-<path d="M42.0266 48.2987C42.6157 48.2987 43.0933 47.8211 43.0933 47.232C43.0933 46.6429 42.6157 46.1653 42.0266 46.1653C41.4375 46.1653 40.96 46.6429 40.96 47.232C40.96 47.8211 41.4375 48.2987 42.0266 48.2987Z" fill="white"/>
-<path d="M52.3307 48.2987C52.9198 48.2987 53.3974 47.8211 53.3974 47.232C53.3974 46.6429 52.9198 46.1653 52.3307 46.1653C51.7416 46.1653 51.264 46.6429 51.264 47.232C51.264 47.8211 51.7416 48.2987 52.3307 48.2987Z" fill="white"/>
-<path d="M31.744 48.2987C32.3331 48.2987 32.8107 47.8211 32.8107 47.232C32.8107 46.6429 32.3331 46.1653 31.744 46.1653C31.1549 46.1653 30.6774 46.6429 30.6774 47.232C30.6774 47.8211 31.1549 48.2987 31.744 48.2987Z" fill="white"/>
-<path d="M21.44 54.6987C22.0291 54.6987 22.5066 54.2211 22.5066 53.632C22.5066 53.0429 22.0291 52.5653 21.44 52.5653C20.8509 52.5653 20.3733 53.0429 20.3733 53.632C20.3733 54.2211 20.8509 54.6987 21.44 54.6987Z" fill="white"/>
-<path d="M11.136 54.6987C11.7251 54.6987 12.2027 54.2211 12.2027 53.632C12.2027 53.0429 11.7251 52.5653 11.136 52.5653C10.5469 52.5653 10.0693 53.0429 10.0693 53.632C10.0693 54.2211 10.5469 54.6987 11.136 54.6987Z" fill="white"/>
-<path d="M42.0266 54.6987C42.6157 54.6987 43.0933 54.2211 43.0933 53.632C43.0933 53.0429 42.6157 52.5653 42.0266 52.5653C41.4375 52.5653 40.96 53.0429 40.96 53.632C40.96 54.2211 41.4375 54.6987 42.0266 54.6987Z" fill="white"/>
-<path d="M52.3307 54.6987C52.9198 54.6987 53.3974 54.2211 53.3974 53.632C53.3974 53.0429 52.9198 52.5653 52.3307 52.5653C51.7416 52.5653 51.264 53.0429 51.264 53.632C51.264 54.2211 51.7416 54.6987 52.3307 54.6987Z" fill="white"/>
-<path d="M31.744 54.6987C32.3331 54.6987 32.8107 54.2211 32.8107 53.632C32.8107 53.0429 32.3331 52.5653 31.744 52.5653C31.1549 52.5653 30.6774 53.0429 30.6774 53.632C30.6774 54.2211 31.1549 54.6987 31.744 54.6987Z" fill="white"/>
-<path d="M57.3653 40.6613C56.8021 39.9945 56.1085 39.4498 55.3271 39.0609C54.5456 38.6721 53.6929 38.4471 52.8213 38.4C51.7176 38.4458 50.6446 38.7766 49.7066 39.36C48.9973 39.8171 48.1812 40.0817 47.3387 40.128C46.5286 40.0845 45.7463 39.8188 45.0773 39.36C44.1083 38.7587 42.9961 38.4273 41.856 38.4C40.5547 38.4 37.9093 40.1493 37.0987 40.1493C36.3334 40.0967 35.5964 39.8388 34.9653 39.4027L34.688 39.2533C33.8521 38.7183 32.8854 38.4232 31.8933 38.4C30.7896 38.4458 29.7166 38.7766 28.7787 39.36C28.0614 39.817 27.2385 40.0815 26.3893 40.128C25.5806 40.0782 24.7998 39.813 24.128 39.36C23.1465 38.7514 22.0187 38.4196 20.864 38.4C19.5627 38.4 16.896 40.1493 16.0853 40.1493C15.32 40.0967 14.583 39.8388 13.952 39.4027C13.0538 38.796 12.0055 38.449 10.9227 38.4C10.0859 38.4669 9.27289 38.7107 8.53737 39.1152C7.80186 39.5198 7.16059 40.0758 6.65599 40.7467C6.47939 40.9933 6.40722 41.2997 6.45515 41.5993C6.50308 41.8988 6.66724 42.1674 6.91199 42.3467C7.10244 42.4896 7.33525 42.5647 7.57332 42.56C7.76091 42.5609 7.94598 42.5168 8.11302 42.4315C8.28005 42.3461 8.42418 42.2219 8.53332 42.0693C8.82151 41.6747 9.18825 41.344 9.61047 41.098C10.0327 40.852 10.5012 40.6961 10.9867 40.64C11.6545 40.7006 12.2947 40.9361 12.8427 41.3227C13.8277 41.9688 14.9719 42.3305 16.1493 42.368C17.5645 42.0887 18.9257 41.5846 20.1813 40.8747C20.4545 40.7682 20.7422 40.7035 21.0347 40.6827C21.3546 40.666 21.6744 40.7169 21.9733 40.832L22.2933 40.9813L22.9973 41.344C24.0107 41.997 25.1842 42.3587 26.3893 42.3893C26.8788 42.3836 27.3658 42.3191 27.84 42.1973C27.84 42.1973 30.1867 41.216 31.104 40.832C31.3598 40.7495 31.625 40.6993 31.8933 40.6827C33.408 40.6827 35.2853 42.368 37.1627 42.368C38.5767 42.0849 39.9374 41.581 41.1947 40.8747C41.4671 40.7659 41.7552 40.7011 42.048 40.6827C42.3677 40.6697 42.6868 40.7204 42.9867 40.832L43.2853 40.9813L43.9893 41.344C45.0107 41.9967 46.1909 42.3582 47.4026 42.3893C48.6311 42.3564 49.8297 42.0034 50.88 41.3653C51.4804 40.9728 52.1701 40.738 52.8853 40.6827C53.4028 40.7303 53.9055 40.8814 54.3636 41.1269C54.8217 41.3724 55.2258 41.7074 55.552 42.112C55.6635 42.2538 55.8062 42.368 55.969 42.4457C56.1318 42.5234 56.3103 42.5625 56.4907 42.56C56.7546 42.5603 57.0107 42.4699 57.216 42.304C57.452 42.1049 57.6 41.8208 57.628 41.5133C57.656 41.2058 57.5616 40.8997 57.3653 40.6613Z" fill="white"/>
-<path d="M25.6 22.784C25.5674 22.4292 25.5674 22.0721 25.6 21.7173H6.40002V23.8507H25.6C25.5674 23.4959 25.5674 23.1388 25.6 22.784Z" fill="white"/>
-<path d="M38.272 21.7173C38.2942 22.0725 38.2942 22.4288 38.272 22.784C38.2942 23.1392 38.2942 23.4955 38.272 23.8507H57.472V21.7173H38.272Z" fill="white"/>
-<path d="M36.096 21.7173C36.1889 22.0655 36.2391 22.4237 36.2454 22.784C36.2454 23.9156 35.7958 25.0008 34.9957 25.801C34.1955 26.6011 33.1103 27.0507 31.9787 27.0507C30.8471 27.0507 29.7619 26.6011 28.9617 25.801C28.1616 25.0008 27.712 23.9156 27.712 22.784C27.7183 22.4237 27.7685 22.0655 27.8614 21.7173H25.6C25.5674 22.0721 25.5674 22.4292 25.6 22.784C25.6 24.4814 26.2743 26.1092 27.4745 27.3095C28.6748 28.5097 30.3026 29.184 32 29.184C33.6974 29.184 35.3253 28.5097 36.5255 27.3095C37.7257 26.1092 38.4 24.4814 38.4 22.784C38.4223 22.4288 38.4223 22.0725 38.4 21.7173H36.096Z" fill="white"/>
-<path d="M57.5787 32.576H6.37866V34.7093H57.5787V32.576Z" fill="white"/>
-<path d="M38.272 5.69601C37.5894 5.69601 34.4747 9.81335 32.2987 14.6987C30.8831 17.3348 30.0535 20.2456 29.8667 23.232C29.8667 23.7978 30.0915 24.3404 30.4915 24.7405C30.8916 25.1406 31.4342 25.3653 32 25.3653C32.5658 25.3653 33.1084 25.1406 33.5085 24.7405C33.9086 24.3404 34.1334 23.7978 34.1334 23.232C33.528 20.6715 33.4554 18.0138 33.92 15.424C34.8254 11.9639 36.2958 8.67704 38.272 5.69601Z" fill="white"/>
+<path d="M21.44 48.2987C22.0291 48.2987 22.5066 47.8211 22.5066 47.232C22.5066 46.6429 22.0291 46.1653 21.44 46.1653C20.8509 46.1653 20.3733 46.6429 20.3733 47.232C20.3733 47.8211 20.8509 48.2987 21.44 48.2987Z" />
+<path d="M11.136 48.2987C11.7251 48.2987 12.2027 47.8211 12.2027 47.232C12.2027 46.6429 11.7251 46.1653 11.136 46.1653C10.5469 46.1653 10.0693 46.6429 10.0693 47.232C10.0693 47.8211 10.5469 48.2987 11.136 48.2987Z" />
+<path d="M42.0266 48.2987C42.6157 48.2987 43.0933 47.8211 43.0933 47.232C43.0933 46.6429 42.6157 46.1653 42.0266 46.1653C41.4375 46.1653 40.96 46.6429 40.96 47.232C40.96 47.8211 41.4375 48.2987 42.0266 48.2987Z" />
+<path d="M52.3307 48.2987C52.9198 48.2987 53.3974 47.8211 53.3974 47.232C53.3974 46.6429 52.9198 46.1653 52.3307 46.1653C51.7416 46.1653 51.264 46.6429 51.264 47.232C51.264 47.8211 51.7416 48.2987 52.3307 48.2987Z" />
+<path d="M31.744 48.2987C32.3331 48.2987 32.8107 47.8211 32.8107 47.232C32.8107 46.6429 32.3331 46.1653 31.744 46.1653C31.1549 46.1653 30.6774 46.6429 30.6774 47.232C30.6774 47.8211 31.1549 48.2987 31.744 48.2987Z" />
+<path d="M21.44 54.6987C22.0291 54.6987 22.5066 54.2211 22.5066 53.632C22.5066 53.0429 22.0291 52.5653 21.44 52.5653C20.8509 52.5653 20.3733 53.0429 20.3733 53.632C20.3733 54.2211 20.8509 54.6987 21.44 54.6987Z" />
+<path d="M11.136 54.6987C11.7251 54.6987 12.2027 54.2211 12.2027 53.632C12.2027 53.0429 11.7251 52.5653 11.136 52.5653C10.5469 52.5653 10.0693 53.0429 10.0693 53.632C10.0693 54.2211 10.5469 54.6987 11.136 54.6987Z" />
+<path d="M42.0266 54.6987C42.6157 54.6987 43.0933 54.2211 43.0933 53.632C43.0933 53.0429 42.6157 52.5653 42.0266 52.5653C41.4375 52.5653 40.96 53.0429 40.96 53.632C40.96 54.2211 41.4375 54.6987 42.0266 54.6987Z" />
+<path d="M52.3307 54.6987C52.9198 54.6987 53.3974 54.2211 53.3974 53.632C53.3974 53.0429 52.9198 52.5653 52.3307 52.5653C51.7416 52.5653 51.264 53.0429 51.264 53.632C51.264 54.2211 51.7416 54.6987 52.3307 54.6987Z" />
+<path d="M31.744 54.6987C32.3331 54.6987 32.8107 54.2211 32.8107 53.632C32.8107 53.0429 32.3331 52.5653 31.744 52.5653C31.1549 52.5653 30.6774 53.0429 30.6774 53.632C30.6774 54.2211 31.1549 54.6987 31.744 54.6987Z" />
+<path d="M57.3653 40.6613C56.8021 39.9945 56.1085 39.4498 55.3271 39.0609C54.5456 38.6721 53.6929 38.4471 52.8213 38.4C51.7176 38.4458 50.6446 38.7766 49.7066 39.36C48.9973 39.8171 48.1812 40.0817 47.3387 40.128C46.5286 40.0845 45.7463 39.8188 45.0773 39.36C44.1083 38.7587 42.9961 38.4273 41.856 38.4C40.5547 38.4 37.9093 40.1493 37.0987 40.1493C36.3334 40.0967 35.5964 39.8388 34.9653 39.4027L34.688 39.2533C33.8521 38.7183 32.8854 38.4232 31.8933 38.4C30.7896 38.4458 29.7166 38.7766 28.7787 39.36C28.0614 39.817 27.2385 40.0815 26.3893 40.128C25.5806 40.0782 24.7998 39.813 24.128 39.36C23.1465 38.7514 22.0187 38.4196 20.864 38.4C19.5627 38.4 16.896 40.1493 16.0853 40.1493C15.32 40.0967 14.583 39.8388 13.952 39.4027C13.0538 38.796 12.0055 38.449 10.9227 38.4C10.0859 38.4669 9.27289 38.7107 8.53737 39.1152C7.80186 39.5198 7.16059 40.0758 6.65599 40.7467C6.47939 40.9933 6.40722 41.2997 6.45515 41.5993C6.50308 41.8988 6.66724 42.1674 6.91199 42.3467C7.10244 42.4896 7.33525 42.5647 7.57332 42.56C7.76091 42.5609 7.94598 42.5168 8.11302 42.4315C8.28005 42.3461 8.42418 42.2219 8.53332 42.0693C8.82151 41.6747 9.18825 41.344 9.61047 41.098C10.0327 40.852 10.5012 40.6961 10.9867 40.64C11.6545 40.7006 12.2947 40.9361 12.8427 41.3227C13.8277 41.9688 14.9719 42.3305 16.1493 42.368C17.5645 42.0887 18.9257 41.5846 20.1813 40.8747C20.4545 40.7682 20.7422 40.7035 21.0347 40.6827C21.3546 40.666 21.6744 40.7169 21.9733 40.832L22.2933 40.9813L22.9973 41.344C24.0107 41.997 25.1842 42.3587 26.3893 42.3893C26.8788 42.3836 27.3658 42.3191 27.84 42.1973C27.84 42.1973 30.1867 41.216 31.104 40.832C31.3598 40.7495 31.625 40.6993 31.8933 40.6827C33.408 40.6827 35.2853 42.368 37.1627 42.368C38.5767 42.0849 39.9374 41.581 41.1947 40.8747C41.4671 40.7659 41.7552 40.7011 42.048 40.6827C42.3677 40.6697 42.6868 40.7204 42.9867 40.832L43.2853 40.9813L43.9893 41.344C45.0107 41.9967 46.1909 42.3582 47.4026 42.3893C48.6311 42.3564 49.8297 42.0034 50.88 41.3653C51.4804 40.9728 52.1701 40.738 52.8853 40.6827C53.4028 40.7303 53.9055 40.8814 54.3636 41.1269C54.8217 41.3724 55.2258 41.7074 55.552 42.112C55.6635 42.2538 55.8062 42.368 55.969 42.4457C56.1318 42.5234 56.3103 42.5625 56.4907 42.56C56.7546 42.5603 57.0107 42.4699 57.216 42.304C57.452 42.1049 57.6 41.8208 57.628 41.5133C57.656 41.2058 57.5616 40.8997 57.3653 40.6613Z" />
+<path d="M25.6 22.784C25.5674 22.4292 25.5674 22.0721 25.6 21.7173H6.40002V23.8507H25.6C25.5674 23.4959 25.5674 23.1388 25.6 22.784Z" />
+<path d="M38.272 21.7173C38.2942 22.0725 38.2942 22.4288 38.272 22.784C38.2942 23.1392 38.2942 23.4955 38.272 23.8507H57.472V21.7173H38.272Z" />
+<path d="M36.096 21.7173C36.1889 22.0655 36.2391 22.4237 36.2454 22.784C36.2454 23.9156 35.7958 25.0008 34.9957 25.801C34.1955 26.6011 33.1103 27.0507 31.9787 27.0507C30.8471 27.0507 29.7619 26.6011 28.9617 25.801C28.1616 25.0008 27.712 23.9156 27.712 22.784C27.7183 22.4237 27.7685 22.0655 27.8614 21.7173H25.6C25.5674 22.0721 25.5674 22.4292 25.6 22.784C25.6 24.4814 26.2743 26.1092 27.4745 27.3095C28.6748 28.5097 30.3026 29.184 32 29.184C33.6974 29.184 35.3253 28.5097 36.5255 27.3095C37.7257 26.1092 38.4 24.4814 38.4 22.784C38.4223 22.4288 38.4223 22.0725 38.4 21.7173H36.096Z" />
+<path d="M57.5787 32.576H6.37866V34.7093H57.5787V32.576Z" />
+<path d="M38.272 5.69601C37.5894 5.69601 34.4747 9.81335 32.2987 14.6987C30.8831 17.3348 30.0535 20.2456 29.8667 23.232C29.8667 23.7978 30.0915 24.3404 30.4915 24.7405C30.8916 25.1406 31.4342 25.3653 32 25.3653C32.5658 25.3653 33.1084 25.1406 33.5085 24.7405C33.9086 24.3404 34.1334 23.7978 34.1334 23.232C33.528 20.6715 33.4554 18.0138 33.92 15.424C34.8254 11.9639 36.2958 8.67704 38.272 5.69601Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_393">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-small-intestine.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-small-intestine.svg
index 46cc292a6..2833a68ac 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-small-intestine.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-small-intestine.svg
@@ -1,10 +1,10 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_413)">
-<path d="M22.8693 12.096C22.8693 13.9093 23.9787 19.5413 27.6693 21.5253C30.5493 23.0827 37.2907 22.9333 39.8507 23.6587C40.9863 24.1671 41.9991 24.9143 42.82 25.8494C43.641 26.7844 44.2508 27.8854 44.608 29.0773C44.7787 30.0587 46.208 28.3733 48.32 28.6933C50.432 29.0133 51.904 32.832 51.2853 35.52C50.7722 37.018 49.779 38.3047 48.4597 39.1803C47.1404 40.056 45.569 40.4716 43.9893 40.3627C42.0054 40.0239 40.2184 38.9594 38.976 37.376C37.1627 34.1333 38.4 32.384 36.2667 33.344C34.1333 34.304 36.992 37.3333 37.8667 39.744C38.1923 40.421 38.2913 41.1848 38.1492 41.9225C38.007 42.6602 37.6312 43.3325 37.0773 43.84C36.448 44.4798 35.6134 44.8776 34.72 44.9634C33.8267 45.0492 32.9316 44.8176 32.192 44.3093C31.2311 43.7021 30.1994 43.2149 29.12 42.8587C26.3893 42.0053 23.1893 42.0267 22.976 39.5307C22.7627 37.0347 24.9813 36.8427 24.9813 36.48C24.9813 36.1173 19.4987 35.584 19.8187 32.7893C20.0747 30.656 24.0853 30.3147 24.0853 30.3147C24.0853 30.3147 27.904 30.3147 27.904 29.8667C27.904 29.4187 19.3707 28.416 18.816 32.4693C18.432 35.4133 22.272 35.7333 22.4853 38.8693C22.6987 42.0053 20.352 43.3067 22.1227 44.1173C24.4693 45.1627 26.688 43.2853 29.056 43.52C31.424 43.7547 33.728 46.08 35.1147 46.0373C37.0987 46.0373 38.1227 42.0907 41.8987 41.5147C43.0331 41.2914 44.2092 41.4383 45.2538 41.9337C46.2985 42.4291 47.1564 43.2469 47.7013 44.2667C48.2024 45.6252 48.2146 47.1159 47.7357 48.4825C47.2568 49.849 46.3168 51.0061 45.0773 51.7547C42.9448 53.2233 40.4548 54.088 37.8709 54.257C35.2871 54.426 32.7057 53.893 30.4 52.7147C31.04 55.7653 28.8 56.4053 27.904 56.448C25.3227 56.6187 24.1493 53.12 22.336 52.1813C19.9492 50.9628 17.2498 50.4944 14.592 50.8373C12.288 51.3493 11.52 48.0213 14.1227 47.4027C17.1535 46.9591 20.2479 47.4191 23.0187 48.7253C24.2749 49.3011 25.3891 50.1459 26.2827 51.2C26.2669 50.5086 26.4849 49.8321 26.9013 49.28C27.2664 48.7646 27.6886 48.2923 28.16 47.872L31.2747 47.0613L35.1147 49.9627L37.248 50.1333C37.248 50.1333 33.984 50.1333 37.44 50.0267C39.6021 50.0875 41.7066 49.325 43.328 47.8933C43.5667 47.6799 43.7199 47.3871 43.7591 47.0694C43.7983 46.7516 43.7209 46.4304 43.5413 46.1653C43.2213 45.7813 42.7947 45.632 41.9413 46.1653C40.5973 46.976 38.848 50.0053 37.2907 50.0693C36.3093 50.0693 29.056 47.7013 27.904 47.936C25.6 48.4907 23.2107 49.4507 20.736 48.2987C19.7877 47.9478 18.9489 47.3527 18.3045 46.5735C17.6602 45.7943 17.2331 44.8586 17.0667 43.8613C16.9387 42.0907 18.1973 40.576 18.112 39.5947C18.0267 38.6133 13.632 36.2667 14.72 31.296C15.808 26.3253 22.6133 24.896 25.3867 25.1947C28.16 25.4933 32.1707 26.5813 32.2773 29.4613C32.384 32.3413 29.6747 33.4507 29.5893 33.728C29.504 34.0053 30.4 34.496 30.6987 35.8613C30.7794 36.8911 30.5569 37.9219 30.0587 38.8267C30.6753 38.9 31.2828 39.0359 31.872 39.232C32.6613 39.552 33.344 40.192 33.4293 40.1493C32.5385 38.3513 31.8653 36.4535 31.424 34.496C31.2966 33.3357 31.5816 32.1675 32.2291 31.1963C32.8766 30.2251 33.8453 29.5127 34.9653 29.184C37.696 28.3733 40.8533 29.76 41.3653 31.3173C41.8773 32.8747 41.8133 34.3253 43.2427 35.584C43.4966 35.7982 43.7911 35.959 44.1085 36.057C44.4259 36.1549 44.7598 36.188 45.0903 36.1541C45.4208 36.1203 45.741 36.0203 46.032 35.86C46.323 35.6997 46.5788 35.4825 46.784 35.2213C47.232 34.56 47.5093 32.384 46.6347 32.832C45.5853 33.3819 44.3703 33.5262 43.2213 33.2373C40.7893 32.5973 40.384 28.5867 38.9547 27.84C37.5253 27.0933 32.2133 27.3707 31.0613 27.1147C29.9093 26.8587 23.1253 25.1093 20.9067 20.3733C19.5048 17.7937 18.7714 14.904 18.7733 11.968C18.496 10.2187 22.848 10.304 22.8693 12.096Z" fill="white"/>
+<path d="M22.8693 12.096C22.8693 13.9093 23.9787 19.5413 27.6693 21.5253C30.5493 23.0827 37.2907 22.9333 39.8507 23.6587C40.9863 24.1671 41.9991 24.9143 42.82 25.8494C43.641 26.7844 44.2508 27.8854 44.608 29.0773C44.7787 30.0587 46.208 28.3733 48.32 28.6933C50.432 29.0133 51.904 32.832 51.2853 35.52C50.7722 37.018 49.779 38.3047 48.4597 39.1803C47.1404 40.056 45.569 40.4716 43.9893 40.3627C42.0054 40.0239 40.2184 38.9594 38.976 37.376C37.1627 34.1333 38.4 32.384 36.2667 33.344C34.1333 34.304 36.992 37.3333 37.8667 39.744C38.1923 40.421 38.2913 41.1848 38.1492 41.9225C38.007 42.6602 37.6312 43.3325 37.0773 43.84C36.448 44.4798 35.6134 44.8776 34.72 44.9634C33.8267 45.0492 32.9316 44.8176 32.192 44.3093C31.2311 43.7021 30.1994 43.2149 29.12 42.8587C26.3893 42.0053 23.1893 42.0267 22.976 39.5307C22.7627 37.0347 24.9813 36.8427 24.9813 36.48C24.9813 36.1173 19.4987 35.584 19.8187 32.7893C20.0747 30.656 24.0853 30.3147 24.0853 30.3147C24.0853 30.3147 27.904 30.3147 27.904 29.8667C27.904 29.4187 19.3707 28.416 18.816 32.4693C18.432 35.4133 22.272 35.7333 22.4853 38.8693C22.6987 42.0053 20.352 43.3067 22.1227 44.1173C24.4693 45.1627 26.688 43.2853 29.056 43.52C31.424 43.7547 33.728 46.08 35.1147 46.0373C37.0987 46.0373 38.1227 42.0907 41.8987 41.5147C43.0331 41.2914 44.2092 41.4383 45.2538 41.9337C46.2985 42.4291 47.1564 43.2469 47.7013 44.2667C48.2024 45.6252 48.2146 47.1159 47.7357 48.4825C47.2568 49.849 46.3168 51.0061 45.0773 51.7547C42.9448 53.2233 40.4548 54.088 37.8709 54.257C35.2871 54.426 32.7057 53.893 30.4 52.7147C31.04 55.7653 28.8 56.4053 27.904 56.448C25.3227 56.6187 24.1493 53.12 22.336 52.1813C19.9492 50.9628 17.2498 50.4944 14.592 50.8373C12.288 51.3493 11.52 48.0213 14.1227 47.4027C17.1535 46.9591 20.2479 47.4191 23.0187 48.7253C24.2749 49.3011 25.3891 50.1459 26.2827 51.2C26.2669 50.5086 26.4849 49.8321 26.9013 49.28C27.2664 48.7646 27.6886 48.2923 28.16 47.872L31.2747 47.0613L35.1147 49.9627L37.248 50.1333C37.248 50.1333 33.984 50.1333 37.44 50.0267C39.6021 50.0875 41.7066 49.325 43.328 47.8933C43.5667 47.6799 43.7199 47.3871 43.7591 47.0694C43.7983 46.7516 43.7209 46.4304 43.5413 46.1653C43.2213 45.7813 42.7947 45.632 41.9413 46.1653C40.5973 46.976 38.848 50.0053 37.2907 50.0693C36.3093 50.0693 29.056 47.7013 27.904 47.936C25.6 48.4907 23.2107 49.4507 20.736 48.2987C19.7877 47.9478 18.9489 47.3527 18.3045 46.5735C17.6602 45.7943 17.2331 44.8586 17.0667 43.8613C16.9387 42.0907 18.1973 40.576 18.112 39.5947C18.0267 38.6133 13.632 36.2667 14.72 31.296C15.808 26.3253 22.6133 24.896 25.3867 25.1947C28.16 25.4933 32.1707 26.5813 32.2773 29.4613C32.384 32.3413 29.6747 33.4507 29.5893 33.728C29.504 34.0053 30.4 34.496 30.6987 35.8613C30.7794 36.8911 30.5569 37.9219 30.0587 38.8267C30.6753 38.9 31.2828 39.0359 31.872 39.232C32.6613 39.552 33.344 40.192 33.4293 40.1493C32.5385 38.3513 31.8653 36.4535 31.424 34.496C31.2966 33.3357 31.5816 32.1675 32.2291 31.1963C32.8766 30.2251 33.8453 29.5127 34.9653 29.184C37.696 28.3733 40.8533 29.76 41.3653 31.3173C41.8773 32.8747 41.8133 34.3253 43.2427 35.584C43.4966 35.7982 43.7911 35.959 44.1085 36.057C44.4259 36.1549 44.7598 36.188 45.0903 36.1541C45.4208 36.1203 45.741 36.0203 46.032 35.86C46.323 35.6997 46.5788 35.4825 46.784 35.2213C47.232 34.56 47.5093 32.384 46.6347 32.832C45.5853 33.3819 44.3703 33.5262 43.2213 33.2373C40.7893 32.5973 40.384 28.5867 38.9547 27.84C37.5253 27.0933 32.2133 27.3707 31.0613 27.1147C29.9093 26.8587 23.1253 25.1093 20.9067 20.3733C19.5048 17.7937 18.7714 14.904 18.7733 11.968C18.496 10.2187 22.848 10.304 22.8693 12.096Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_413">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-spinal-cord.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-spinal-cord.svg
index 528ec9418..da89cd07d 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-spinal-cord.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-spinal-cord.svg
@@ -1,11 +1,11 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_417)">
-<path d="M25.5796 27.2881C25.9458 29.1403 22.3486 30.1094 23.1887 31.94C24.3303 33.7707 26.7427 34.3522 28.5952 33.2107C28.8967 33.0169 29.1552 32.8015 29.3921 32.5431C31.5461 30.5617 29.0044 28.8388 29.8014 27.4173C30.3614 26.4267 30.5768 26.5343 31.2876 26.1467C31.9338 25.7375 32.6877 25.5652 33.4416 25.6513C35.0571 25.6513 35.8109 28.6234 38.6111 27.5896C41.4113 26.5559 41.1528 23.9284 39.6665 21.9686C38.4388 20.3533 35.9186 23.0885 34.4324 21.9686C33.5924 21.2794 35.7032 18.3719 33.5062 18.7811C31.3092 19.1903 31.3522 20.3749 31.6538 22.9377C31.4384 23.713 30.8784 24.3376 30.146 24.6607C29.4352 25.1129 28.5736 25.3283 27.7336 25.2637C25.5796 23.7992 24.5672 23.2177 23.1887 24.9622C21.8101 26.7066 25.3427 26.2113 25.5796 27.2881Z" fill="white"/>
-<path d="M58.8584 16.9505C57.1352 16.5198 53.3011 17.5751 52.8272 17.209C52.3534 16.8428 52.0303 15.8952 50.5225 15.0553C49.3594 14.3231 47.9162 14.1938 46.6454 14.6892C45.4607 15.1414 46.2361 13.8708 42.3374 14.0215C40.5927 13.9569 38.8695 14.3446 37.2971 15.1199C37.2756 15.1199 37.2325 15.1199 37.211 15.1199C33.8723 14.5815 30.0813 15.2061 26.5919 16.9075C23.2748 18.5012 20.69 20.8702 19.053 23.4546L19.1176 23.2392C16.6406 24.2945 14.6158 26.2113 13.4096 28.6234C11.2556 32.3492 12.8065 32.3062 11.7511 33.1892C10.5664 34.1799 9.94172 35.6659 10.0279 37.195C10.114 38.358 10.3725 39.4994 10.7818 40.5763C10.7818 41.0931 7.57235 45.0128 6.47383 47.188C6.12919 47.5541 5.9138 48.071 5.99996 48.6094C6.10765 49.3417 6.68923 49.9016 7.40004 50.0093C7.46465 50.0093 7.52927 49.9662 7.61543 49.9447C7.85237 49.9447 8.06777 49.9016 8.28316 49.794C8.54164 49.6217 8.86473 49.0832 9.18783 48.3725C9.61862 47.7264 9.96326 47.0588 9.96326 46.6496C10.6956 45.0128 11.5572 43.2468 12.5911 42.6653C13.3019 41.8254 14.9389 42.2992 17.1144 42.7299V44.0652L17.1575 43.6991C17.1575 43.6991 17.1575 49.1909 24.6318 50.6339C29.6721 51.603 37.0602 50.8708 37.0602 46.6927C41.562 48.5664 45.4391 40.2747 45.4391 37.2596V32.3708C44.3837 33.4045 42.7467 33.5768 41.5404 32.6508C41.5189 32.6508 41.4974 32.6077 41.4543 32.5862C42.5959 33.0169 43.9313 32.8231 44.7068 32.5862C44.7499 32.5862 44.7714 32.5431 44.8145 32.5431C46.3438 32.0262 48.4978 29.2049 49.5963 27.2666C51.4702 24.1007 52.138 19.858 53.6242 19.5349C55.3258 18.6089 58.3414 20.0518 59.2461 19.5349C59.6122 19.3411 59.8707 18.9965 59.9353 18.5873C60.0861 17.8335 59.5907 17.1228 58.8368 16.9721L58.8584 16.9505ZM27.5396 18.8242C29.9306 17.6612 32.4292 17.0582 34.7985 17.0582C35.5093 17.0582 36.1986 17.1228 36.8879 17.2305C39.6665 17.6828 41.7343 19.0396 42.7036 21.0425C43.6729 23.0454 43.4575 25.5006 42.0789 27.9558C41.0666 29.7864 39.4942 31.4232 37.5771 32.78C36.2201 31.1647 34.777 29.6356 33.2046 28.2142L33.1615 28.2573L32.9892 28.3865C33.7 29.8941 34.3893 31.3155 35.1432 32.6938C35.2939 33.1246 35.4878 33.5338 35.7247 33.8999C35.4878 34.0291 35.2724 34.1799 35.0355 34.2875C28.7459 37.3242 21.9609 36.3335 19.8931 32.0693C17.8252 27.805 21.2501 21.8609 27.5396 18.8242ZM13.1727 39.844C14.3143 37.6903 14.6158 35.1921 13.9912 32.8231C13.7112 30.0233 15.2189 27.3527 17.7391 26.1252C17.3514 27.2451 17.1575 28.3434 17.1575 29.4418H17.136V39.9517C19.5915 39.9732 22.0901 39.9086 24.1579 38.638C24.201 38.6164 24.2656 38.5949 24.3087 38.5518C24.5456 38.358 24.7395 38.1426 24.8687 37.8626C24.8687 37.8626 24.8687 37.8411 24.8903 37.8196H24.9333C24.2225 39.7794 20.7977 40.3394 18.9884 40.447C18.7515 40.447 18.4499 40.4686 18.1699 40.4686C18.1268 40.4686 18.1053 40.4686 18.0622 40.4686C17.7606 40.4686 17.4375 40.4686 17.1144 40.447C14.0989 40.3178 10.3294 39.6933 13.1511 39.7794L13.1727 39.844ZM46.8177 25.9098C46.193 26.4697 45.8053 26.7713 45.4607 26.8789V23.1746H45.4176C45.353 22.0978 45.0945 21.064 44.6206 20.0949C43.6513 18.092 41.9282 16.6059 39.6234 15.7445C41.4974 14.9045 43.716 15.0553 45.4607 16.2614C47.0115 17.7905 49.0793 18.6519 51.2548 18.7165C50.1779 21.344 48.6701 23.7561 46.8177 25.9098Z" fill="white"/>
+<path d="M25.5796 27.2881C25.9458 29.1403 22.3486 30.1094 23.1887 31.94C24.3303 33.7707 26.7427 34.3522 28.5952 33.2107C28.8967 33.0169 29.1552 32.8015 29.3921 32.5431C31.5461 30.5617 29.0044 28.8388 29.8014 27.4173C30.3614 26.4267 30.5768 26.5343 31.2876 26.1467C31.9338 25.7375 32.6877 25.5652 33.4416 25.6513C35.0571 25.6513 35.8109 28.6234 38.6111 27.5896C41.4113 26.5559 41.1528 23.9284 39.6665 21.9686C38.4388 20.3533 35.9186 23.0885 34.4324 21.9686C33.5924 21.2794 35.7032 18.3719 33.5062 18.7811C31.3092 19.1903 31.3522 20.3749 31.6538 22.9377C31.4384 23.713 30.8784 24.3376 30.146 24.6607C29.4352 25.1129 28.5736 25.3283 27.7336 25.2637C25.5796 23.7992 24.5672 23.2177 23.1887 24.9622C21.8101 26.7066 25.3427 26.2113 25.5796 27.2881Z" />
+<path d="M58.8584 16.9505C57.1352 16.5198 53.3011 17.5751 52.8272 17.209C52.3534 16.8428 52.0303 15.8952 50.5225 15.0553C49.3594 14.3231 47.9162 14.1938 46.6454 14.6892C45.4607 15.1414 46.2361 13.8708 42.3374 14.0215C40.5927 13.9569 38.8695 14.3446 37.2971 15.1199C37.2756 15.1199 37.2325 15.1199 37.211 15.1199C33.8723 14.5815 30.0813 15.2061 26.5919 16.9075C23.2748 18.5012 20.69 20.8702 19.053 23.4546L19.1176 23.2392C16.6406 24.2945 14.6158 26.2113 13.4096 28.6234C11.2556 32.3492 12.8065 32.3062 11.7511 33.1892C10.5664 34.1799 9.94172 35.6659 10.0279 37.195C10.114 38.358 10.3725 39.4994 10.7818 40.5763C10.7818 41.0931 7.57235 45.0128 6.47383 47.188C6.12919 47.5541 5.9138 48.071 5.99996 48.6094C6.10765 49.3417 6.68923 49.9016 7.40004 50.0093C7.46465 50.0093 7.52927 49.9662 7.61543 49.9447C7.85237 49.9447 8.06777 49.9016 8.28316 49.794C8.54164 49.6217 8.86473 49.0832 9.18783 48.3725C9.61862 47.7264 9.96326 47.0588 9.96326 46.6496C10.6956 45.0128 11.5572 43.2468 12.5911 42.6653C13.3019 41.8254 14.9389 42.2992 17.1144 42.7299V44.0652L17.1575 43.6991C17.1575 43.6991 17.1575 49.1909 24.6318 50.6339C29.6721 51.603 37.0602 50.8708 37.0602 46.6927C41.562 48.5664 45.4391 40.2747 45.4391 37.2596V32.3708C44.3837 33.4045 42.7467 33.5768 41.5404 32.6508C41.5189 32.6508 41.4974 32.6077 41.4543 32.5862C42.5959 33.0169 43.9313 32.8231 44.7068 32.5862C44.7499 32.5862 44.7714 32.5431 44.8145 32.5431C46.3438 32.0262 48.4978 29.2049 49.5963 27.2666C51.4702 24.1007 52.138 19.858 53.6242 19.5349C55.3258 18.6089 58.3414 20.0518 59.2461 19.5349C59.6122 19.3411 59.8707 18.9965 59.9353 18.5873C60.0861 17.8335 59.5907 17.1228 58.8368 16.9721L58.8584 16.9505ZM27.5396 18.8242C29.9306 17.6612 32.4292 17.0582 34.7985 17.0582C35.5093 17.0582 36.1986 17.1228 36.8879 17.2305C39.6665 17.6828 41.7343 19.0396 42.7036 21.0425C43.6729 23.0454 43.4575 25.5006 42.0789 27.9558C41.0666 29.7864 39.4942 31.4232 37.5771 32.78C36.2201 31.1647 34.777 29.6356 33.2046 28.2142L33.1615 28.2573L32.9892 28.3865C33.7 29.8941 34.3893 31.3155 35.1432 32.6938C35.2939 33.1246 35.4878 33.5338 35.7247 33.8999C35.4878 34.0291 35.2724 34.1799 35.0355 34.2875C28.7459 37.3242 21.9609 36.3335 19.8931 32.0693C17.8252 27.805 21.2501 21.8609 27.5396 18.8242ZM13.1727 39.844C14.3143 37.6903 14.6158 35.1921 13.9912 32.8231C13.7112 30.0233 15.2189 27.3527 17.7391 26.1252C17.3514 27.2451 17.1575 28.3434 17.1575 29.4418H17.136V39.9517C19.5915 39.9732 22.0901 39.9086 24.1579 38.638C24.201 38.6164 24.2656 38.5949 24.3087 38.5518C24.5456 38.358 24.7395 38.1426 24.8687 37.8626C24.8687 37.8626 24.8687 37.8411 24.8903 37.8196H24.9333C24.2225 39.7794 20.7977 40.3394 18.9884 40.447C18.7515 40.447 18.4499 40.4686 18.1699 40.4686C18.1268 40.4686 18.1053 40.4686 18.0622 40.4686C17.7606 40.4686 17.4375 40.4686 17.1144 40.447C14.0989 40.3178 10.3294 39.6933 13.1511 39.7794L13.1727 39.844ZM46.8177 25.9098C46.193 26.4697 45.8053 26.7713 45.4607 26.8789V23.1746H45.4176C45.353 22.0978 45.0945 21.064 44.6206 20.0949C43.6513 18.092 41.9282 16.6059 39.6234 15.7445C41.4974 14.9045 43.716 15.0553 45.4607 16.2614C47.0115 17.7905 49.0793 18.6519 51.2548 18.7165C50.1779 21.344 48.6701 23.7561 46.8177 25.9098Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_417">
-<rect width="54" height="37" fill="white" transform="translate(6 14)"/>
+<rect width="54" height="37"  transform="translate(6 14)"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-spleen.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-spleen.svg
index dfa8e1448..b3af83a81 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-spleen.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-spleen.svg
@@ -1,10 +1,10 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_429)">
-<path d="M47.5946 22.6347C39.296 5.67466 25.0026 7.12533 20.544 10.6667C16.0853 14.208 13.9306 18.1547 15.296 23.68C16.1493 27.072 20.0533 28.8427 23.3173 31.2107C22.4553 32.3643 21.9442 33.742 21.8453 35.1787C20.71 36.3266 19.3812 37.2654 17.92 37.952C15.905 38.697 13.846 39.3169 11.7546 39.808L13.184 42.9653C15.1618 42.4922 17.1014 41.8718 18.9866 41.1093C20.5394 40.3322 21.9756 39.3412 23.2533 38.1653C24.7533 39.3443 26.642 39.9155 28.544 39.7653C29.2906 43.8827 28.992 48.2987 30.2293 51.328C31.936 55.5947 36.8853 55.744 40.5973 55.0827C48.32 53.7173 55.8933 39.5947 47.5946 22.6347ZM33.9413 35.136C33.3653 35.456 32.512 35.904 31.5946 36.3093C31.2102 34.9685 30.6354 33.6897 29.888 32.512C29.3978 31.7695 28.8635 31.0571 28.288 30.3787C29.3006 29.8736 30.3404 29.4249 31.4026 29.0347C31.9008 29.7044 32.3364 30.4185 32.704 31.168C33.302 32.4255 33.7186 33.7615 33.9413 35.136ZM29.6746 27.3493C28.8426 27.6693 27.6906 28.1387 26.6026 28.672C25.4836 27.6627 24.2084 26.8414 22.8266 26.24C23.9739 25.893 25.1853 25.8125 26.3683 26.0048C27.5514 26.197 28.6749 26.6569 29.6533 27.3493H29.6746ZM24.2346 35.8827C24.1818 34.7827 24.5564 33.7049 25.28 32.8747C25.996 33.5639 26.607 34.3546 27.0933 35.2213C27.4233 35.8667 27.7015 36.5373 27.9253 37.2267C25.8346 37.2693 24.448 36.5013 24.2133 35.904L24.2346 35.8827ZM32.1493 38.592L34.1333 37.5893C34.1061 39.5894 33.4657 41.5329 32.2986 43.1573C32.4361 41.6416 32.3787 40.1145 32.128 38.6133L32.1493 38.592Z" fill="white"/>
+<path d="M47.5946 22.6347C39.296 5.67466 25.0026 7.12533 20.544 10.6667C16.0853 14.208 13.9306 18.1547 15.296 23.68C16.1493 27.072 20.0533 28.8427 23.3173 31.2107C22.4553 32.3643 21.9442 33.742 21.8453 35.1787C20.71 36.3266 19.3812 37.2654 17.92 37.952C15.905 38.697 13.846 39.3169 11.7546 39.808L13.184 42.9653C15.1618 42.4922 17.1014 41.8718 18.9866 41.1093C20.5394 40.3322 21.9756 39.3412 23.2533 38.1653C24.7533 39.3443 26.642 39.9155 28.544 39.7653C29.2906 43.8827 28.992 48.2987 30.2293 51.328C31.936 55.5947 36.8853 55.744 40.5973 55.0827C48.32 53.7173 55.8933 39.5947 47.5946 22.6347ZM33.9413 35.136C33.3653 35.456 32.512 35.904 31.5946 36.3093C31.2102 34.9685 30.6354 33.6897 29.888 32.512C29.3978 31.7695 28.8635 31.0571 28.288 30.3787C29.3006 29.8736 30.3404 29.4249 31.4026 29.0347C31.9008 29.7044 32.3364 30.4185 32.704 31.168C33.302 32.4255 33.7186 33.7615 33.9413 35.136ZM29.6746 27.3493C28.8426 27.6693 27.6906 28.1387 26.6026 28.672C25.4836 27.6627 24.2084 26.8414 22.8266 26.24C23.9739 25.893 25.1853 25.8125 26.3683 26.0048C27.5514 26.197 28.6749 26.6569 29.6533 27.3493H29.6746ZM24.2346 35.8827C24.1818 34.7827 24.5564 33.7049 25.28 32.8747C25.996 33.5639 26.607 34.3546 27.0933 35.2213C27.4233 35.8667 27.7015 36.5373 27.9253 37.2267C25.8346 37.2693 24.448 36.5013 24.2133 35.904L24.2346 35.8827ZM32.1493 38.592L34.1333 37.5893C34.1061 39.5894 33.4657 41.5329 32.2986 43.1573C32.4361 41.6416 32.3787 40.1145 32.128 38.6133L32.1493 38.592Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_429">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-stomach.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-stomach.svg
index 03f72d484..08cb79a1f 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-stomach.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-stomach.svg
@@ -1,10 +1,10 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_433)">
-<path d="M47.4454 11.776C38.4854 11.776 41.152 16.1493 36.032 16.192C31.3814 16.192 32.384 7.33865 32.384 7.33865H27.0507C27.0507 7.33865 26.432 15.872 29.6107 19.968C34.752 26.624 35.4987 39.7013 25.344 39.5307C21.0774 39.5307 21.0774 35.392 15.0614 35.392C13.4075 35.3268 11.7615 35.652 10.2567 36.3414C8.75194 37.0308 7.43071 38.0649 6.40002 39.36L10.3894 41.92C10.7255 41.2489 11.2395 40.6831 11.8753 40.2843C12.5111 39.8855 13.2442 39.6691 13.9947 39.6587C15.1227 39.6921 16.1914 40.1711 16.9671 40.9907C17.7427 41.8104 18.1621 42.9039 18.1334 44.032C18.1334 46.6347 14.9334 49.0667 17.0667 53.3333C19.2 57.6 25.3867 59.0933 35.3494 58.1973C44.1387 57.6 52.1387 47.5093 55.6587 36.2667C60.2667 21.3333 56.32 11.776 47.4454 11.776Z" fill="white"/>
+<path d="M47.4454 11.776C38.4854 11.776 41.152 16.1493 36.032 16.192C31.3814 16.192 32.384 7.33865 32.384 7.33865H27.0507C27.0507 7.33865 26.432 15.872 29.6107 19.968C34.752 26.624 35.4987 39.7013 25.344 39.5307C21.0774 39.5307 21.0774 35.392 15.0614 35.392C13.4075 35.3268 11.7615 35.652 10.2567 36.3414C8.75194 37.0308 7.43071 38.0649 6.40002 39.36L10.3894 41.92C10.7255 41.2489 11.2395 40.6831 11.8753 40.2843C12.5111 39.8855 13.2442 39.6691 13.9947 39.6587C15.1227 39.6921 16.1914 40.1711 16.9671 40.9907C17.7427 41.8104 18.1621 42.9039 18.1334 44.032C18.1334 46.6347 14.9334 49.0667 17.0667 53.3333C19.2 57.6 25.3867 59.0933 35.3494 58.1973C44.1387 57.6 52.1387 47.5093 55.6587 36.2667C60.2667 21.3333 56.32 11.776 47.4454 11.776Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_433">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-thymus.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-thymus.svg
index 24650b836..2784653d0 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-thymus.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-thymus.svg
@@ -1,10 +1,10 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_437)">
-<path d="M48 40.5333C48.0671 39.2184 47.6916 37.919 46.9334 36.8427C47.4053 35.9108 47.6468 34.8792 47.6374 33.8347C47.6374 31.2747 46.3787 29.2053 44.8214 29.184C44.8214 29.0133 44.8214 28.8427 44.8214 28.672C44.9218 27.7797 44.7642 26.8772 44.3671 26.0718C43.9701 25.2664 43.3503 24.5918 42.5814 24.128C42.6684 23.7286 42.7113 23.3208 42.7094 22.912C42.7094 20.544 41.6427 18.6453 40.256 18.3253C40.2786 17.9844 40.2786 17.6423 40.256 17.3013C40.3133 16.489 40.17 15.6751 39.839 14.9311C39.5079 14.1872 38.9991 13.5359 38.3574 13.0347C38.4 10.496 37.056 8.53333 35.5414 8.53333C34.0267 8.53333 32.7254 10.6667 32.7254 13.1627C32.7273 13.5844 32.7629 14.0053 32.832 14.4213H32.5974C31.0187 14.4213 29.76 16.5547 29.76 19.072C29.76 19.1787 29.76 19.2853 29.76 19.392C29.3951 19.8277 29.1131 20.3266 28.928 20.864C28.8306 20.7412 28.7156 20.6334 28.5867 20.544C28.7069 20.0261 28.7713 19.4969 28.7787 18.9653C28.7787 16.4053 27.4987 14.336 25.9414 14.336C25.9414 14.208 25.9414 14.08 25.9414 13.952C25.9414 11.392 24.64 10.4107 23.0614 10.4107C21.4827 10.4107 20.288 11.392 20.288 13.952C20.2766 14.1367 20.2766 14.3219 20.288 14.5067C19.7873 15.0508 19.4009 15.69 19.1517 16.3862C18.9025 17.0825 18.7956 17.8217 18.8374 18.56C18.8186 19.5096 18.9928 20.453 19.3494 21.3333C18.7157 21.8405 18.2141 22.4934 17.8872 23.2363C17.5603 23.9792 17.4179 24.7902 17.472 25.6C17.4615 25.7918 17.4615 25.9841 17.472 26.176C16.9541 26.7153 16.5524 27.3552 16.2918 28.0561C16.0313 28.757 15.9174 29.504 15.9574 30.2507C15.9407 31.4448 16.2585 32.6197 16.8747 33.6427C16.3853 34.5919 16.1362 35.6467 16.1494 36.7147C16.1404 37.7246 16.3591 38.7236 16.7894 39.6373C16.624 40.2713 16.538 40.9234 16.5334 41.5787C16.5334 44.1173 17.7707 46.1653 19.328 46.208C19.3174 46.3215 19.3174 46.4358 19.328 46.5493C19.328 48.896 20.3734 50.816 21.76 51.136C22.0787 51.6607 22.5219 52.0988 23.0503 52.4114C23.5787 52.724 24.176 52.9014 24.7894 52.928C25.556 52.8782 26.292 52.6082 26.9088 52.1503C27.5257 51.6923 27.9972 51.0661 28.2667 50.3467C28.5917 50.5571 28.9678 50.675 29.3547 50.688C30.592 50.688 31.6587 49.344 32.0214 47.5093C32.213 47.9211 32.5125 48.2733 32.8881 48.5287C33.2637 48.7841 33.7013 48.9331 34.1547 48.96H34.1334C34.133 49.7258 34.3288 50.4789 34.7023 51.1474C35.0758 51.8159 35.6144 52.3775 36.2667 52.7787C36.5341 53.517 37.008 54.1629 37.6321 54.6394C38.2561 55.116 39.0041 55.4032 39.7867 55.4667C41.92 55.4667 43.6267 53.3333 43.8614 50.5813C44.4407 50.0402 44.8909 49.3759 45.179 48.6374C45.467 47.8989 45.5854 47.1051 45.5254 46.3147C45.5155 45.8995 45.4727 45.4857 45.3974 45.0773C46.9334 44.9493 48 42.9867 48 40.5333Z" fill="white"/>
+<path d="M48 40.5333C48.0671 39.2184 47.6916 37.919 46.9334 36.8427C47.4053 35.9108 47.6468 34.8792 47.6374 33.8347C47.6374 31.2747 46.3787 29.2053 44.8214 29.184C44.8214 29.0133 44.8214 28.8427 44.8214 28.672C44.9218 27.7797 44.7642 26.8772 44.3671 26.0718C43.9701 25.2664 43.3503 24.5918 42.5814 24.128C42.6684 23.7286 42.7113 23.3208 42.7094 22.912C42.7094 20.544 41.6427 18.6453 40.256 18.3253C40.2786 17.9844 40.2786 17.6423 40.256 17.3013C40.3133 16.489 40.17 15.6751 39.839 14.9311C39.5079 14.1872 38.9991 13.5359 38.3574 13.0347C38.4 10.496 37.056 8.53333 35.5414 8.53333C34.0267 8.53333 32.7254 10.6667 32.7254 13.1627C32.7273 13.5844 32.7629 14.0053 32.832 14.4213H32.5974C31.0187 14.4213 29.76 16.5547 29.76 19.072C29.76 19.1787 29.76 19.2853 29.76 19.392C29.3951 19.8277 29.1131 20.3266 28.928 20.864C28.8306 20.7412 28.7156 20.6334 28.5867 20.544C28.7069 20.0261 28.7713 19.4969 28.7787 18.9653C28.7787 16.4053 27.4987 14.336 25.9414 14.336C25.9414 14.208 25.9414 14.08 25.9414 13.952C25.9414 11.392 24.64 10.4107 23.0614 10.4107C21.4827 10.4107 20.288 11.392 20.288 13.952C20.2766 14.1367 20.2766 14.3219 20.288 14.5067C19.7873 15.0508 19.4009 15.69 19.1517 16.3862C18.9025 17.0825 18.7956 17.8217 18.8374 18.56C18.8186 19.5096 18.9928 20.453 19.3494 21.3333C18.7157 21.8405 18.2141 22.4934 17.8872 23.2363C17.5603 23.9792 17.4179 24.7902 17.472 25.6C17.4615 25.7918 17.4615 25.9841 17.472 26.176C16.9541 26.7153 16.5524 27.3552 16.2918 28.0561C16.0313 28.757 15.9174 29.504 15.9574 30.2507C15.9407 31.4448 16.2585 32.6197 16.8747 33.6427C16.3853 34.5919 16.1362 35.6467 16.1494 36.7147C16.1404 37.7246 16.3591 38.7236 16.7894 39.6373C16.624 40.2713 16.538 40.9234 16.5334 41.5787C16.5334 44.1173 17.7707 46.1653 19.328 46.208C19.3174 46.3215 19.3174 46.4358 19.328 46.5493C19.328 48.896 20.3734 50.816 21.76 51.136C22.0787 51.6607 22.5219 52.0988 23.0503 52.4114C23.5787 52.724 24.176 52.9014 24.7894 52.928C25.556 52.8782 26.292 52.6082 26.9088 52.1503C27.5257 51.6923 27.9972 51.0661 28.2667 50.3467C28.5917 50.5571 28.9678 50.675 29.3547 50.688C30.592 50.688 31.6587 49.344 32.0214 47.5093C32.213 47.9211 32.5125 48.2733 32.8881 48.5287C33.2637 48.7841 33.7013 48.9331 34.1547 48.96H34.1334C34.133 49.7258 34.3288 50.4789 34.7023 51.1474C35.0758 51.8159 35.6144 52.3775 36.2667 52.7787C36.5341 53.517 37.008 54.1629 37.6321 54.6394C38.2561 55.116 39.0041 55.4032 39.7867 55.4667C41.92 55.4667 43.6267 53.3333 43.8614 50.5813C44.4407 50.0402 44.8909 49.3759 45.179 48.6374C45.467 47.8989 45.5854 47.1051 45.5254 46.3147C45.5155 45.8995 45.4727 45.4857 45.3974 45.0773C46.9334 44.9493 48 42.9867 48 40.5333Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_437">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-trachea.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-trachea.svg
index 5564d12bc..345bd102a 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-trachea.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-trachea.svg
@@ -1,24 +1,24 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_497)">
 <g clip-path="url(#clip1_1795_497)">
-<path d="M35.2307 37.2093C36.7015 36.7047 38.341 36.0318 38.8955 34.8543C39.1607 34.3256 39.1607 33.7248 38.9196 33.124C38.2927 31.4899 36.0987 32.307 33.7841 33.1481C32.3857 33.6527 30.9391 34.2054 29.9024 34.2054H29.6613C27.0333 34.2054 25.8277 33.7488 24.7187 32.4031L24.2847 31.8744L23.8507 32.4031C23.0792 33.3163 22.6693 34.3736 22.6693 35.455C22.6693 38.7473 26.3341 41.4147 30.8186 41.4147C32.8438 41.4147 37.7382 41.2465 39.1366 39.5643C39.4741 39.1798 39.5947 38.7233 39.5224 38.2426C39.2571 36.7527 37.1354 36.945 35.2307 37.2093Z" fill="white"/>
-<path d="M37.7624 24.0403L37.3284 23.5597L36.8944 24.0403C35.6648 25.4341 33.3261 26.3233 30.8186 26.3233C28.3112 26.3233 25.9966 25.4581 24.7428 24.0403L24.3089 23.5597L23.8749 24.0403C23.0792 24.9295 22.6935 25.8907 22.6935 26.876C22.6935 29.9039 26.3341 32.3791 30.8186 32.3791C35.3031 32.3791 38.9438 29.9039 38.9438 26.876C38.9438 25.8907 38.5339 24.9295 37.7624 24.0403Z" fill="white"/>
-<path d="M37.2319 -0.543411L36.8461 -1L36.4604 -0.543411C35.3272 0.754264 33.1573 1.54729 30.8427 1.54729C28.5281 1.54729 26.4064 0.730233 25.225 -0.567442L24.8393 -1L24.4535 -0.543411C23.7302 0.273643 23.3685 1.18682 23.3685 2.07597C23.3685 4.8876 26.7198 7.17054 30.8668 7.17054C35.0138 7.17054 38.3651 4.8876 38.3651 2.07597C38.3651 1.16279 37.9793 0.273643 37.2801 -0.543411H37.2319Z" fill="white"/>
-<path d="M37.0873 16.3504L36.6774 15.8217L36.2675 16.3504C35.1102 17.8163 32.9644 18.7054 30.698 18.7054H30.6498C28.3594 18.7054 26.2135 17.7923 25.0804 16.3504L24.6705 15.8217L24.2606 16.3264C23.5614 17.1915 23.1757 18.2008 23.1757 19.2101C23.1757 22.5504 26.2618 24.8574 30.6739 24.8574C35.0861 24.8574 38.1722 22.5264 38.1722 19.2101C38.1722 18.2248 37.8106 17.2395 37.1114 16.3264L37.0873 16.3504Z" fill="white"/>
-<path d="M40.2216 41.3907C39.7394 41.0543 39.2089 40.9101 38.7026 41.0062L38.5097 41.0783C37.907 41.4147 37.2319 42.1116 36.388 42.9767C34.8209 44.6109 32.651 46.8457 30.5052 46.8457C28.6728 46.8457 26.6475 44.683 25.1768 43.0969C23.8025 41.631 22.8863 40.6698 21.9942 41.0062C21.1504 41.3426 20.0654 42.1357 19.752 44.0822C19.5109 45.5 20.6923 46.1969 21.9219 46.9419C23.0792 47.6388 24.5258 48.4798 25.4179 50.1861C25.6349 50.6186 25.876 51.0992 26.1171 51.5798C27.4432 54.2954 28.938 57.3713 31.4213 57.3954H31.4455C33.8565 57.3954 34.8691 55.1364 36.0505 52.5171C36.3881 51.7721 36.7497 50.955 37.1596 50.162C38.2204 48.1194 39.3295 47.1341 40.1251 46.4372C40.969 45.6923 41.6923 45.0434 41.5235 43.7698C41.403 42.7845 40.8967 41.8473 40.1975 41.3426L40.2216 41.3907Z" fill="white"/>
-<path d="M37.2802 7.57907L36.8703 7.09845L36.4604 7.57907C35.4478 8.80465 34.3387 9.23721 31.9518 9.26124H31.7107C30.7463 9.26124 29.4202 8.75659 28.1424 8.27597C26.0207 7.48295 24.0195 6.76202 23.4409 8.25194C23.2239 8.82868 23.2239 9.35736 23.465 9.86202C24.0437 11.0876 25.8278 11.6884 27.2744 12.169C27.3468 12.169 27.395 12.2171 27.4673 12.2411C27.3226 12.193 27.178 12.169 27.0333 12.1209C25.7073 11.7364 24.3089 11.3519 23.4891 11.9287C23.248 12.0969 22.9587 12.4093 22.8864 12.986C22.8381 13.4186 22.9828 13.8512 23.3203 14.2116C24.6705 15.7016 29.0586 15.8457 30.8668 15.8457C37.0391 15.8457 38.3169 12.8659 38.3169 10.3667C38.3169 9.3814 37.9552 8.42016 37.2319 7.57907H37.2802Z" fill="white"/>
-<path d="M14.5924 61C15.8943 60.207 21.3915 56.9868 26.768 55.5209C25.8519 53.6465 24.4776 50.7628 23.7302 49.4651C23.1997 48.5519 22.0183 47.831 20.8852 47.2783C18.0401 50.3302 14.3754 52.3969 11.3857 53.4302C11.1687 53.9829 10.6383 55.6171 11.3857 57.6357C12.109 59.6302 13.9173 60.6876 14.6165 61H14.5924Z" fill="white"/>
-<path d="M39.5947 44.4186C39.5947 44.4186 39.5947 44.4186 39.5706 44.3705L39.6188 44.4186H39.5947Z" fill="white"/>
-<path d="M52.8312 53.7907C49.07 52.469 44.6096 50.0659 41.5235 46.8217C40.535 47.807 38.4133 50.0178 37.8346 51.4116C37.3524 52.5891 36.5086 54.2713 35.9781 55.3287C41.7164 56.5543 47.985 59.486 49.3352 60.1349C49.9139 59.8946 51.4328 59.1736 52.0838 58.1643C53.2893 56.2899 53 54.4636 52.8553 53.8147L52.8312 53.7907Z" fill="white"/>
-<path d="M25.2009 41.3186C24.8633 41.4628 28.3834 45.2116 29.9988 45.5C31.6142 45.7884 33.5671 43.986 34.1699 43.4093C34.7726 42.8326 35.4959 42.4 35.1584 42.2558C34.4833 41.9674 32.3134 43.0488 29.9988 42.7124C27.6842 42.376 25.9724 40.9822 25.2009 41.3426V41.3186Z" fill="white"/>
+<path d="M35.2307 37.2093C36.7015 36.7047 38.341 36.0318 38.8955 34.8543C39.1607 34.3256 39.1607 33.7248 38.9196 33.124C38.2927 31.4899 36.0987 32.307 33.7841 33.1481C32.3857 33.6527 30.9391 34.2054 29.9024 34.2054H29.6613C27.0333 34.2054 25.8277 33.7488 24.7187 32.4031L24.2847 31.8744L23.8507 32.4031C23.0792 33.3163 22.6693 34.3736 22.6693 35.455C22.6693 38.7473 26.3341 41.4147 30.8186 41.4147C32.8438 41.4147 37.7382 41.2465 39.1366 39.5643C39.4741 39.1798 39.5947 38.7233 39.5224 38.2426C39.2571 36.7527 37.1354 36.945 35.2307 37.2093Z" />
+<path d="M37.7624 24.0403L37.3284 23.5597L36.8944 24.0403C35.6648 25.4341 33.3261 26.3233 30.8186 26.3233C28.3112 26.3233 25.9966 25.4581 24.7428 24.0403L24.3089 23.5597L23.8749 24.0403C23.0792 24.9295 22.6935 25.8907 22.6935 26.876C22.6935 29.9039 26.3341 32.3791 30.8186 32.3791C35.3031 32.3791 38.9438 29.9039 38.9438 26.876C38.9438 25.8907 38.5339 24.9295 37.7624 24.0403Z" />
+<path d="M37.2319 -0.543411L36.8461 -1L36.4604 -0.543411C35.3272 0.754264 33.1573 1.54729 30.8427 1.54729C28.5281 1.54729 26.4064 0.730233 25.225 -0.567442L24.8393 -1L24.4535 -0.543411C23.7302 0.273643 23.3685 1.18682 23.3685 2.07597C23.3685 4.8876 26.7198 7.17054 30.8668 7.17054C35.0138 7.17054 38.3651 4.8876 38.3651 2.07597C38.3651 1.16279 37.9793 0.273643 37.2801 -0.543411H37.2319Z" />
+<path d="M37.0873 16.3504L36.6774 15.8217L36.2675 16.3504C35.1102 17.8163 32.9644 18.7054 30.698 18.7054H30.6498C28.3594 18.7054 26.2135 17.7923 25.0804 16.3504L24.6705 15.8217L24.2606 16.3264C23.5614 17.1915 23.1757 18.2008 23.1757 19.2101C23.1757 22.5504 26.2618 24.8574 30.6739 24.8574C35.0861 24.8574 38.1722 22.5264 38.1722 19.2101C38.1722 18.2248 37.8106 17.2395 37.1114 16.3264L37.0873 16.3504Z" />
+<path d="M40.2216 41.3907C39.7394 41.0543 39.2089 40.9101 38.7026 41.0062L38.5097 41.0783C37.907 41.4147 37.2319 42.1116 36.388 42.9767C34.8209 44.6109 32.651 46.8457 30.5052 46.8457C28.6728 46.8457 26.6475 44.683 25.1768 43.0969C23.8025 41.631 22.8863 40.6698 21.9942 41.0062C21.1504 41.3426 20.0654 42.1357 19.752 44.0822C19.5109 45.5 20.6923 46.1969 21.9219 46.9419C23.0792 47.6388 24.5258 48.4798 25.4179 50.1861C25.6349 50.6186 25.876 51.0992 26.1171 51.5798C27.4432 54.2954 28.938 57.3713 31.4213 57.3954H31.4455C33.8565 57.3954 34.8691 55.1364 36.0505 52.5171C36.3881 51.7721 36.7497 50.955 37.1596 50.162C38.2204 48.1194 39.3295 47.1341 40.1251 46.4372C40.969 45.6923 41.6923 45.0434 41.5235 43.7698C41.403 42.7845 40.8967 41.8473 40.1975 41.3426L40.2216 41.3907Z" />
+<path d="M37.2802 7.57907L36.8703 7.09845L36.4604 7.57907C35.4478 8.80465 34.3387 9.23721 31.9518 9.26124H31.7107C30.7463 9.26124 29.4202 8.75659 28.1424 8.27597C26.0207 7.48295 24.0195 6.76202 23.4409 8.25194C23.2239 8.82868 23.2239 9.35736 23.465 9.86202C24.0437 11.0876 25.8278 11.6884 27.2744 12.169C27.3468 12.169 27.395 12.2171 27.4673 12.2411C27.3226 12.193 27.178 12.169 27.0333 12.1209C25.7073 11.7364 24.3089 11.3519 23.4891 11.9287C23.248 12.0969 22.9587 12.4093 22.8864 12.986C22.8381 13.4186 22.9828 13.8512 23.3203 14.2116C24.6705 15.7016 29.0586 15.8457 30.8668 15.8457C37.0391 15.8457 38.3169 12.8659 38.3169 10.3667C38.3169 9.3814 37.9552 8.42016 37.2319 7.57907H37.2802Z" />
+<path d="M14.5924 61C15.8943 60.207 21.3915 56.9868 26.768 55.5209C25.8519 53.6465 24.4776 50.7628 23.7302 49.4651C23.1997 48.5519 22.0183 47.831 20.8852 47.2783C18.0401 50.3302 14.3754 52.3969 11.3857 53.4302C11.1687 53.9829 10.6383 55.6171 11.3857 57.6357C12.109 59.6302 13.9173 60.6876 14.6165 61H14.5924Z" />
+<path d="M39.5947 44.4186C39.5947 44.4186 39.5947 44.4186 39.5706 44.3705L39.6188 44.4186H39.5947Z" />
+<path d="M52.8312 53.7907C49.07 52.469 44.6096 50.0659 41.5235 46.8217C40.535 47.807 38.4133 50.0178 37.8346 51.4116C37.3524 52.5891 36.5086 54.2713 35.9781 55.3287C41.7164 56.5543 47.985 59.486 49.3352 60.1349C49.9139 59.8946 51.4328 59.1736 52.0838 58.1643C53.2893 56.2899 53 54.4636 52.8553 53.8147L52.8312 53.7907Z" />
+<path d="M25.2009 41.3186C24.8633 41.4628 28.3834 45.2116 29.9988 45.5C31.6142 45.7884 33.5671 43.986 34.1699 43.4093C34.7726 42.8326 35.4959 42.4 35.1584 42.2558C34.4833 41.9674 32.3134 43.0488 29.9988 42.7124C27.6842 42.376 25.9724 40.9822 25.2009 41.3426V41.3186Z" />
 </g>
 </g>
 <defs>
 <clipPath id="clip0_1795_497">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 <clipPath id="clip1_1795_497">
-<rect width="42" height="62" fill="white" transform="translate(11 -1)"/>
+<rect width="42" height="62"  transform="translate(11 -1)"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-ureter-left.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-ureter-left.svg
index 5995127fd..94316718f 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-ureter-left.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-ureter-left.svg
@@ -1,3 +1,3 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M52.3307 4.88534C49.6044 6.3046 47.2683 8.37154 45.5275 10.9046C43.7867 13.4377 42.6945 16.3595 42.3467 19.4133C41.9423 23.253 40.5616 26.9251 38.3361 30.08C37.9094 30.6133 37.4614 31.104 36.9921 31.5947L35.9894 32.5973L35.0081 33.5573C34.1232 34.3116 32.9918 34.7141 31.8294 34.688C29.0267 33.1725 25.8848 32.3943 22.6987 32.4267C19.5461 32.3722 16.4296 33.1054 13.6321 34.56C12.9782 34.6114 12.3208 34.524 11.7031 34.3034C11.0854 34.0828 10.5214 33.734 10.0481 33.28L6.65605 29.8667L4.73605 31.7867L3.90405 32.64L7.31739 36.0747C8.10475 36.9371 8.53884 38.0642 8.53339 39.232C7.74747 40.646 7.30191 42.2238 7.23205 43.84C7.23205 48.4907 10.9441 52.48 16.2774 54.272C16.9216 54.4848 17.5767 54.6629 18.2401 54.8053C18.9863 55.4118 19.5894 56.1757 20.0061 57.0424C20.4229 57.909 20.643 58.8571 20.6507 59.8187H24.5547C24.5685 58.8768 24.7852 57.949 25.1902 57.0986C25.5952 56.2481 26.1789 55.495 26.9014 54.8907C33.3014 53.504 37.9734 49.088 37.9734 43.8827C37.9621 42.2085 37.4897 40.5699 36.6081 39.1467C36.6455 38.5107 36.8048 37.8878 37.0774 37.312C38.607 36.0014 40.0334 34.5749 41.3441 33.0453C43.6576 30.2045 45.2463 26.8442 45.9734 23.2533C46.3984 19.9899 47.4487 16.8391 49.0667 13.9733C50.2117 11.6036 52.1202 9.68764 54.4854 8.53334C54.9005 8.21655 55.185 7.75852 55.285 7.24602C55.385 6.73352 55.2935 6.20215 55.028 5.75255C54.7624 5.30296 54.3412 4.96637 53.8441 4.80654C53.347 4.64671 52.8085 4.67475 52.3307 4.88534Z" fill="white"/>
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+<path d="M52.3307 4.88534C49.6044 6.3046 47.2683 8.37154 45.5275 10.9046C43.7867 13.4377 42.6945 16.3595 42.3467 19.4133C41.9423 23.253 40.5616 26.9251 38.3361 30.08C37.9094 30.6133 37.4614 31.104 36.9921 31.5947L35.9894 32.5973L35.0081 33.5573C34.1232 34.3116 32.9918 34.7141 31.8294 34.688C29.0267 33.1725 25.8848 32.3943 22.6987 32.4267C19.5461 32.3722 16.4296 33.1054 13.6321 34.56C12.9782 34.6114 12.3208 34.524 11.7031 34.3034C11.0854 34.0828 10.5214 33.734 10.0481 33.28L6.65605 29.8667L4.73605 31.7867L3.90405 32.64L7.31739 36.0747C8.10475 36.9371 8.53884 38.0642 8.53339 39.232C7.74747 40.646 7.30191 42.2238 7.23205 43.84C7.23205 48.4907 10.9441 52.48 16.2774 54.272C16.9216 54.4848 17.5767 54.6629 18.2401 54.8053C18.9863 55.4118 19.5894 56.1757 20.0061 57.0424C20.4229 57.909 20.643 58.8571 20.6507 59.8187H24.5547C24.5685 58.8768 24.7852 57.949 25.1902 57.0986C25.5952 56.2481 26.1789 55.495 26.9014 54.8907C33.3014 53.504 37.9734 49.088 37.9734 43.8827C37.9621 42.2085 37.4897 40.5699 36.6081 39.1467C36.6455 38.5107 36.8048 37.8878 37.0774 37.312C38.607 36.0014 40.0334 34.5749 41.3441 33.0453C43.6576 30.2045 45.2463 26.8442 45.9734 23.2533C46.3984 19.9899 47.4487 16.8391 49.0667 13.9733C50.2117 11.6036 52.1202 9.68764 54.4854 8.53334C54.9005 8.21655 55.185 7.75852 55.285 7.24602C55.385 6.73352 55.2935 6.20215 55.028 5.75255C54.7624 5.30296 54.3412 4.96637 53.8441 4.80654C53.347 4.64671 52.8085 4.67475 52.3307 4.88534Z" />
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-ureter-right.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-ureter-right.svg
index f001e8328..cc5539271 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-ureter-right.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-ureter-right.svg
@@ -1,3 +1,3 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M56.6826 36.1173L60.0959 32.6827L59.2639 31.8293L57.3439 29.9093L53.9519 33.3013C53.4786 33.7554 52.9145 34.1041 52.2968 34.3247C51.6792 34.5453 51.0218 34.6328 50.3679 34.5813C47.5606 33.1105 44.4386 32.3422 41.2693 32.3422C38.1 32.3422 34.9779 33.1105 32.1706 34.5813C31.0082 34.6074 29.8768 34.205 28.9919 33.4507L28.0106 32.4907L27.0079 31.488C26.5386 30.9973 26.0906 30.5067 25.6639 29.9733C23.4384 26.8185 22.0576 23.1463 21.6533 19.3067C21.2889 16.2717 20.189 13.3716 18.449 10.8583C16.7091 8.34505 14.3818 6.29468 11.6693 4.88534C11.1914 4.67475 10.653 4.64671 10.1559 4.80654C9.65879 4.96637 9.23757 5.30296 8.97202 5.75255C8.70647 6.20215 8.61503 6.73352 8.71503 7.24602C8.81502 7.75852 9.09951 8.21655 9.51459 8.53334C11.8798 9.68764 13.7883 11.6036 14.9333 13.9733C16.5189 16.8388 17.54 19.9818 17.9413 23.232C18.6684 26.8228 20.257 30.1832 22.5706 33.024C23.8812 34.5536 25.3077 35.98 26.8373 37.2907C27.1098 37.8665 27.2692 38.4894 27.3066 39.1253C26.4249 40.5485 25.9525 42.1872 25.9413 43.8613C25.9413 49.0667 30.6133 53.4827 37.0133 54.8693C37.7277 55.4666 38.3066 56.2095 38.7113 57.0482C39.1159 57.887 39.3371 58.8024 39.3599 59.7333H43.2639C43.2717 58.7717 43.4918 57.8237 43.9085 56.957C44.3253 56.0904 44.9283 55.3265 45.6746 54.72C46.3379 54.5775 46.9931 54.3995 47.6373 54.1867C52.9706 52.3947 56.6826 48.4053 56.6826 43.7547C56.626 42.1743 56.2102 40.6276 55.4666 39.232C55.4718 38.0789 55.9052 36.9689 56.6826 36.1173Z" fill="white"/>
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+<path d="M56.6826 36.1173L60.0959 32.6827L59.2639 31.8293L57.3439 29.9093L53.9519 33.3013C53.4786 33.7554 52.9145 34.1041 52.2968 34.3247C51.6792 34.5453 51.0218 34.6328 50.3679 34.5813C47.5606 33.1105 44.4386 32.3422 41.2693 32.3422C38.1 32.3422 34.9779 33.1105 32.1706 34.5813C31.0082 34.6074 29.8768 34.205 28.9919 33.4507L28.0106 32.4907L27.0079 31.488C26.5386 30.9973 26.0906 30.5067 25.6639 29.9733C23.4384 26.8185 22.0576 23.1463 21.6533 19.3067C21.2889 16.2717 20.189 13.3716 18.449 10.8583C16.7091 8.34505 14.3818 6.29468 11.6693 4.88534C11.1914 4.67475 10.653 4.64671 10.1559 4.80654C9.65879 4.96637 9.23757 5.30296 8.97202 5.75255C8.70647 6.20215 8.61503 6.73352 8.71503 7.24602C8.81502 7.75852 9.09951 8.21655 9.51459 8.53334C11.8798 9.68764 13.7883 11.6036 14.9333 13.9733C16.5189 16.8388 17.54 19.9818 17.9413 23.232C18.6684 26.8228 20.257 30.1832 22.5706 33.024C23.8812 34.5536 25.3077 35.98 26.8373 37.2907C27.1098 37.8665 27.2692 38.4894 27.3066 39.1253C26.4249 40.5485 25.9525 42.1872 25.9413 43.8613C25.9413 49.0667 30.6133 53.4827 37.0133 54.8693C37.7277 55.4666 38.3066 56.2095 38.7113 57.0482C39.1159 57.887 39.3371 58.8024 39.3599 59.7333H43.2639C43.2717 58.7717 43.4918 57.8237 43.9085 56.957C44.3253 56.0904 44.9283 55.3265 45.6746 54.72C46.3379 54.5775 46.9931 54.3995 47.6373 54.1867C52.9706 52.3947 56.6826 48.4053 56.6826 43.7547C56.626 42.1743 56.2102 40.6276 55.4666 39.232C55.4718 38.0789 55.9052 36.9689 56.6826 36.1173Z" />
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-uterus.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-uterus.svg
index 6d5f8adbb..14381bc8e 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-uterus.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-uterus.svg
@@ -1,12 +1,12 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_447)">
-<path d="M50.306 19.2265C46.8222 19.5964 40.374 20.619 40.9366 27.5164C41.1529 30.9107 40.2874 34.2833 38.4914 37.1554C36.9767 39.4618 34.8346 40.3104 34.1638 41.6594C33.493 43.0084 33.9257 49.0573 35.1591 50.3628C36.3925 51.6683 35.8948 58 35.8948 58H38.275C38.5996 55.2584 38.7078 52.4734 38.6429 49.71C38.7511 42.0728 47.969 24.6008 52.275 22.9472C54.612 21.881 57.2086 21.5329 59.7403 21.9028V20.8148C56.6893 19.7922 53.5084 19.27 50.306 19.2265Z" fill="white"/>
-<path d="M48.6182 13.2426C42.1267 12.3505 38.8377 8.15117 32.5193 9.17381C26.2009 8.15117 22.8903 12.22 16.4204 13.2426C12.3308 14.113 8.15456 14.4394 4 14.1783L4.17311 17.8554C9.9289 15.8537 28.2133 14.8745 32.6708 14.8745C37.1283 14.8745 54.1576 15.8537 59.8269 17.7902L60 14.3958C56.17 14.3958 52.3617 14.0042 48.6182 13.2426Z" fill="white"/>
-<path d="M12.7636 22.8819C17.0913 24.5355 26.2659 42.0075 26.3958 49.6448C26.3092 52.4081 26.4174 55.1932 26.7636 57.9347H29.1006C29.1006 57.9347 28.7976 51.4072 29.8146 50.2975C30.8316 49.1878 31.5024 43.0084 30.8316 41.5941C30.1608 40.1798 28.0187 39.4183 26.504 37.0901C24.6647 34.2398 23.7992 30.8455 24.0156 27.4512C24.5565 20.619 18.1299 19.5964 14.6894 19.2265C11.1624 19.27 7.65698 19.7922 4.25977 20.7931V21.5111C7.1593 21.2935 10.0805 21.7504 12.7636 22.8819Z" fill="white"/>
+<path d="M50.306 19.2265C46.8222 19.5964 40.374 20.619 40.9366 27.5164C41.1529 30.9107 40.2874 34.2833 38.4914 37.1554C36.9767 39.4618 34.8346 40.3104 34.1638 41.6594C33.493 43.0084 33.9257 49.0573 35.1591 50.3628C36.3925 51.6683 35.8948 58 35.8948 58H38.275C38.5996 55.2584 38.7078 52.4734 38.6429 49.71C38.7511 42.0728 47.969 24.6008 52.275 22.9472C54.612 21.881 57.2086 21.5329 59.7403 21.9028V20.8148C56.6893 19.7922 53.5084 19.27 50.306 19.2265Z" />
+<path d="M48.6182 13.2426C42.1267 12.3505 38.8377 8.15117 32.5193 9.17381C26.2009 8.15117 22.8903 12.22 16.4204 13.2426C12.3308 14.113 8.15456 14.4394 4 14.1783L4.17311 17.8554C9.9289 15.8537 28.2133 14.8745 32.6708 14.8745C37.1283 14.8745 54.1576 15.8537 59.8269 17.7902L60 14.3958C56.17 14.3958 52.3617 14.0042 48.6182 13.2426Z" />
+<path d="M12.7636 22.8819C17.0913 24.5355 26.2659 42.0075 26.3958 49.6448C26.3092 52.4081 26.4174 55.1932 26.7636 57.9347H29.1006C29.1006 57.9347 28.7976 51.4072 29.8146 50.2975C30.8316 49.1878 31.5024 43.0084 30.8316 41.5941C30.1608 40.1798 28.0187 39.4183 26.504 37.0901C24.6647 34.2398 23.7992 30.8455 24.0156 27.4512C24.5565 20.619 18.1299 19.5964 14.6894 19.2265C11.1624 19.27 7.65698 19.7922 4.25977 20.7931V21.5111C7.1593 21.2935 10.0805 21.7504 12.7636 22.8819Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_447">
-<rect width="56" height="49" fill="white" transform="translate(4 9)"/>
+<rect width="56" height="49"  transform="translate(4 9)"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-vasculature-thick.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-vasculature-thick.svg
index 4b8cd0408..d207df941 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-vasculature-thick.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-vasculature-thick.svg
@@ -1,11 +1,11 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_454)">
-<path d="M49.4321 60.1984C50.6818 58.9487 51.0194 57.2603 50.1863 56.4272C49.3532 55.594 47.6648 55.9317 46.4151 57.1814C45.1654 58.4311 44.8277 60.1195 45.6608 60.9526C46.494 61.7858 48.1824 61.4481 49.4321 60.1984Z" fill="white"/>
-<path d="M60.5226 42.88C60.0779 42.5336 59.5141 42.3772 58.9545 42.4452C58.3949 42.5132 57.8849 42.7999 57.536 43.2427C56.6782 44.2608 55.6797 45.1515 54.5706 45.888C54.1688 46.1063 53.7253 46.2372 53.2693 46.272C53.6773 45.7587 54.048 45.2169 54.3786 44.6507C56.7941 39.6714 57.7271 34.1027 57.0666 28.608C56.9903 28.0422 56.6922 27.5299 56.2382 27.1839C55.7841 26.8378 55.2111 26.6863 54.6453 26.7627C54.0795 26.8391 53.5672 27.1371 53.2212 27.5912C52.8751 28.0452 52.7236 28.6182 52.8 29.184C53.2946 33.4937 52.6701 37.858 50.9866 41.856C50.1523 40.8077 49.4368 39.6701 48.8533 38.464C48.3634 36.4768 48.1764 34.427 48.2986 32.384C48.2986 31.8182 48.0739 31.2756 47.6738 30.8755C47.2737 30.4754 46.7311 30.2507 46.1653 30.2507C45.6175 30.25 45.0905 30.46 44.6933 30.8373C44.2962 31.2146 44.0594 31.7302 44.032 32.2773C43.8845 34.9092 44.1729 37.5474 44.8853 40.0853C45.78 42.0176 46.9123 43.8307 48.256 45.4827C47.1466 46.5707 45.9093 47.616 44.8 48.5333C44.6856 47.9488 44.536 47.3718 44.352 46.8053C44.2304 44.891 43.9737 42.9876 43.584 41.1093C42.8433 38.6525 41.5848 36.3829 39.8933 34.4533C38.8513 33.1863 37.9567 31.805 37.2266 30.336C39.5393 29.5501 41.6563 28.277 43.4346 26.6027C45.678 23.7626 47.3711 20.5285 48.4266 17.0667C48.5964 16.5263 48.5445 15.9407 48.2825 15.4386C48.0204 14.9365 47.5696 14.5591 47.0293 14.3893C46.489 14.2196 45.9033 14.2715 45.4012 14.5335C44.8992 14.7956 44.5217 15.2463 44.352 15.7867C43.5243 18.5449 42.2329 21.142 40.5333 23.4667C39.4764 24.4774 38.2291 25.2678 36.864 25.792C37.8 20.0409 39.3226 14.4008 41.408 8.96C41.5783 8.5638 41.6668 8.13725 41.6681 7.70599C41.6694 7.27472 41.5835 6.84764 41.4156 6.45041C41.2477 6.05317 41.0013 5.69396 40.691 5.39438C40.3808 5.09479 40.0132 4.861 39.6104 4.70706C39.2075 4.55311 38.7777 4.48218 38.3468 4.49853C37.9158 4.51488 37.4926 4.61818 37.1026 4.80221C36.7126 4.98624 36.3638 5.24721 36.0771 5.56944C35.7905 5.89167 35.572 6.26852 35.4346 6.67734C35.2 7.31734 34.2186 9.94134 33.1733 13.312C32.3663 12.0868 31.4677 10.9244 30.4853 9.83467C28.3325 7.71074 25.6751 6.1691 22.7626 5.35467C22.2138 5.21322 21.6313 5.29558 21.1432 5.58364C20.6551 5.8717 20.3014 6.34185 20.16 6.89067C20.0185 7.43949 20.1009 8.02202 20.3889 8.51012C20.677 8.99821 21.1472 9.35189 21.696 9.49334C23.7978 10.0787 25.7242 11.17 27.3066 12.672L28.2026 13.7387C26.5956 14.3116 24.9143 14.6494 23.2106 14.7413C20.9505 14.3738 18.7795 13.5851 16.8106 12.416C16.5684 12.2741 16.3006 12.1813 16.0225 12.1431C15.7443 12.1049 15.4614 12.122 15.1899 12.1933C14.9184 12.2647 14.6636 12.3889 14.4402 12.5589C14.2168 12.7289 14.0291 12.9413 13.888 13.184C13.6081 13.6713 13.5317 14.2493 13.6755 14.7926C13.8193 15.3358 14.1716 15.8004 14.656 16.0853C17.2494 17.6784 20.1638 18.6766 23.1893 19.008C25.6664 18.8692 28.1066 18.3438 30.4213 17.4507H30.5493C30.8792 18.0798 31.1712 18.7281 31.424 19.392C30.6603 22.2459 30.2589 25.1845 30.2293 28.1387C27.4212 26.7993 24.5106 25.6864 21.5253 24.8107C16.9939 23.4849 12.258 23.0004 7.55198 23.3813C6.98618 23.4521 6.47166 23.7447 6.12159 24.1947C5.77152 24.6448 5.61459 25.2155 5.68531 25.7813C5.75604 26.3471 6.04862 26.8617 6.49871 27.2117C6.9488 27.5618 7.51952 27.7187 8.08531 27.648C12.2194 27.3284 16.377 27.7695 20.352 28.9493C21.0986 29.1627 21.8026 29.376 22.4853 29.6107C18.8596 29.7696 15.3284 30.8172 12.2026 32.6613C11.782 32.9963 11.5033 33.4777 11.4224 34.0093C11.3415 34.541 11.4643 35.0835 11.7663 35.5284C12.0683 35.9733 12.5272 36.2878 13.0512 36.4089C13.5751 36.5299 14.1254 36.4487 14.592 36.1813C18.5094 34.0854 22.9956 33.3004 27.392 33.9413C30.5935 34.5331 33.4435 36.3364 35.3493 38.976C36.2743 40.0217 36.9976 41.2296 37.4826 42.5387C37.8094 44.1999 38.0161 45.8824 38.1013 47.5733C38.1187 50.0014 38.6191 52.4018 39.5733 54.6347C40.7904 56.5908 42.3431 58.3168 44.16 59.7333C44.173 59.1068 44.3119 58.4893 44.5684 57.9176C44.825 57.3458 45.1939 56.8316 45.6533 56.4053C46.3832 55.6359 47.34 55.1201 48.384 54.9333C47.6259 54.2708 46.9132 53.5581 46.2506 52.8C47.0186 52.224 48.064 51.4133 49.1946 50.432C50.064 50.5548 50.9407 50.6189 51.8186 50.624C53.6262 50.7098 55.4218 50.2886 57.0026 49.408C58.4987 48.4125 59.8425 47.2053 60.992 45.824C61.3136 45.3692 61.4446 44.8066 61.3569 44.2564C61.2692 43.7063 60.9698 43.2123 60.5226 42.88Z" fill="white"/>
+<path d="M49.4321 60.1984C50.6818 58.9487 51.0194 57.2603 50.1863 56.4272C49.3532 55.594 47.6648 55.9317 46.4151 57.1814C45.1654 58.4311 44.8277 60.1195 45.6608 60.9526C46.494 61.7858 48.1824 61.4481 49.4321 60.1984Z" />
+<path d="M60.5226 42.88C60.0779 42.5336 59.5141 42.3772 58.9545 42.4452C58.3949 42.5132 57.8849 42.7999 57.536 43.2427C56.6782 44.2608 55.6797 45.1515 54.5706 45.888C54.1688 46.1063 53.7253 46.2372 53.2693 46.272C53.6773 45.7587 54.048 45.2169 54.3786 44.6507C56.7941 39.6714 57.7271 34.1027 57.0666 28.608C56.9903 28.0422 56.6922 27.5299 56.2382 27.1839C55.7841 26.8378 55.2111 26.6863 54.6453 26.7627C54.0795 26.8391 53.5672 27.1371 53.2212 27.5912C52.8751 28.0452 52.7236 28.6182 52.8 29.184C53.2946 33.4937 52.6701 37.858 50.9866 41.856C50.1523 40.8077 49.4368 39.6701 48.8533 38.464C48.3634 36.4768 48.1764 34.427 48.2986 32.384C48.2986 31.8182 48.0739 31.2756 47.6738 30.8755C47.2737 30.4754 46.7311 30.2507 46.1653 30.2507C45.6175 30.25 45.0905 30.46 44.6933 30.8373C44.2962 31.2146 44.0594 31.7302 44.032 32.2773C43.8845 34.9092 44.1729 37.5474 44.8853 40.0853C45.78 42.0176 46.9123 43.8307 48.256 45.4827C47.1466 46.5707 45.9093 47.616 44.8 48.5333C44.6856 47.9488 44.536 47.3718 44.352 46.8053C44.2304 44.891 43.9737 42.9876 43.584 41.1093C42.8433 38.6525 41.5848 36.3829 39.8933 34.4533C38.8513 33.1863 37.9567 31.805 37.2266 30.336C39.5393 29.5501 41.6563 28.277 43.4346 26.6027C45.678 23.7626 47.3711 20.5285 48.4266 17.0667C48.5964 16.5263 48.5445 15.9407 48.2825 15.4386C48.0204 14.9365 47.5696 14.5591 47.0293 14.3893C46.489 14.2196 45.9033 14.2715 45.4012 14.5335C44.8992 14.7956 44.5217 15.2463 44.352 15.7867C43.5243 18.5449 42.2329 21.142 40.5333 23.4667C39.4764 24.4774 38.2291 25.2678 36.864 25.792C37.8 20.0409 39.3226 14.4008 41.408 8.96C41.5783 8.5638 41.6668 8.13725 41.6681 7.70599C41.6694 7.27472 41.5835 6.84764 41.4156 6.45041C41.2477 6.05317 41.0013 5.69396 40.691 5.39438C40.3808 5.09479 40.0132 4.861 39.6104 4.70706C39.2075 4.55311 38.7777 4.48218 38.3468 4.49853C37.9158 4.51488 37.4926 4.61818 37.1026 4.80221C36.7126 4.98624 36.3638 5.24721 36.0771 5.56944C35.7905 5.89167 35.572 6.26852 35.4346 6.67734C35.2 7.31734 34.2186 9.94134 33.1733 13.312C32.3663 12.0868 31.4677 10.9244 30.4853 9.83467C28.3325 7.71074 25.6751 6.1691 22.7626 5.35467C22.2138 5.21322 21.6313 5.29558 21.1432 5.58364C20.6551 5.8717 20.3014 6.34185 20.16 6.89067C20.0185 7.43949 20.1009 8.02202 20.3889 8.51012C20.677 8.99821 21.1472 9.35189 21.696 9.49334C23.7978 10.0787 25.7242 11.17 27.3066 12.672L28.2026 13.7387C26.5956 14.3116 24.9143 14.6494 23.2106 14.7413C20.9505 14.3738 18.7795 13.5851 16.8106 12.416C16.5684 12.2741 16.3006 12.1813 16.0225 12.1431C15.7443 12.1049 15.4614 12.122 15.1899 12.1933C14.9184 12.2647 14.6636 12.3889 14.4402 12.5589C14.2168 12.7289 14.0291 12.9413 13.888 13.184C13.6081 13.6713 13.5317 14.2493 13.6755 14.7926C13.8193 15.3358 14.1716 15.8004 14.656 16.0853C17.2494 17.6784 20.1638 18.6766 23.1893 19.008C25.6664 18.8692 28.1066 18.3438 30.4213 17.4507H30.5493C30.8792 18.0798 31.1712 18.7281 31.424 19.392C30.6603 22.2459 30.2589 25.1845 30.2293 28.1387C27.4212 26.7993 24.5106 25.6864 21.5253 24.8107C16.9939 23.4849 12.258 23.0004 7.55198 23.3813C6.98618 23.4521 6.47166 23.7447 6.12159 24.1947C5.77152 24.6448 5.61459 25.2155 5.68531 25.7813C5.75604 26.3471 6.04862 26.8617 6.49871 27.2117C6.9488 27.5618 7.51952 27.7187 8.08531 27.648C12.2194 27.3284 16.377 27.7695 20.352 28.9493C21.0986 29.1627 21.8026 29.376 22.4853 29.6107C18.8596 29.7696 15.3284 30.8172 12.2026 32.6613C11.782 32.9963 11.5033 33.4777 11.4224 34.0093C11.3415 34.541 11.4643 35.0835 11.7663 35.5284C12.0683 35.9733 12.5272 36.2878 13.0512 36.4089C13.5751 36.5299 14.1254 36.4487 14.592 36.1813C18.5094 34.0854 22.9956 33.3004 27.392 33.9413C30.5935 34.5331 33.4435 36.3364 35.3493 38.976C36.2743 40.0217 36.9976 41.2296 37.4826 42.5387C37.8094 44.1999 38.0161 45.8824 38.1013 47.5733C38.1187 50.0014 38.6191 52.4018 39.5733 54.6347C40.7904 56.5908 42.3431 58.3168 44.16 59.7333C44.173 59.1068 44.3119 58.4893 44.5684 57.9176C44.825 57.3458 45.1939 56.8316 45.6533 56.4053C46.3832 55.6359 47.34 55.1201 48.384 54.9333C47.6259 54.2708 46.9132 53.5581 46.2506 52.8C47.0186 52.224 48.064 51.4133 49.1946 50.432C50.064 50.5548 50.9407 50.6189 51.8186 50.624C53.6262 50.7098 55.4218 50.2886 57.0026 49.408C58.4987 48.4125 59.8425 47.2053 60.992 45.824C61.3136 45.3692 61.4446 44.8066 61.3569 44.2564C61.2692 43.7063 60.9698 43.2123 60.5226 42.88Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_454">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 </defs>
 </svg>
diff --git a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-vasculature-thin.svg b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-vasculature-thin.svg
index 60efe77ec..6c45188ac 100644
--- a/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-vasculature-thin.svg
+++ b/projects/ccf-eui/src/assets/icons/organ-icons/organ-icon-vasculature-thin.svg
@@ -1,11 +1,11 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1795_459)">
-<path d="M56.512 24.4907C53.568 24.8747 51.1573 25.0453 49.024 25.1733C42.752 25.6 38.9547 25.856 33.344 31.5733C32.0602 32.8927 30.6285 34.0595 29.0773 35.0507C30.0442 33.2238 30.8165 31.3003 31.3813 29.312C31.7721 27.6857 31.8803 26.0043 31.7013 24.3413V23.4667C31.7013 22.976 31.7013 22.4853 31.7013 21.9733C32.3413 20.9493 33.2373 19.5627 34.1973 18.1547H35.2213C38.1837 18.2345 41.1184 17.5668 43.7547 16.2133C43.879 16.1471 43.9882 16.0559 44.0757 15.9455C44.1632 15.8351 44.2269 15.7079 44.2629 15.5717C44.299 15.4356 44.3065 15.2934 44.2852 15.1542C44.2638 15.015 44.2139 14.8817 44.1387 14.7627C43.9667 14.524 43.7126 14.3572 43.4253 14.2942C43.1379 14.2312 42.8374 14.2765 42.5813 14.4213C40.4059 15.5175 37.9985 16.0737 35.5627 16.0427C35.6278 15.9406 35.6849 15.8336 35.7333 15.7227C36.608 14.08 36.416 10.9013 37.9733 10.5813C38.1125 10.5558 38.2453 10.5028 38.3638 10.4254C38.4823 10.3481 38.5843 10.2479 38.6637 10.1308C38.7431 10.0136 38.7984 9.88183 38.8264 9.7431C38.8544 9.60436 38.8545 9.46144 38.8267 9.32267C38.7929 9.15125 38.7198 8.99 38.6132 8.85157C38.5066 8.71314 38.3694 8.6013 38.2123 8.52483C38.0552 8.44835 37.8825 8.40932 37.7078 8.41079C37.5331 8.41227 37.3611 8.45421 37.2053 8.53333C34.5173 9.06667 34.304 13.1413 33.4293 14.784C33.0944 15.4478 32.7167 16.0891 32.2987 16.704C31.872 17.3227 31.4453 17.9627 31.0613 18.56C30.3194 14.6163 29.205 10.7519 27.7333 7.01867L27.6053 6.4C27.5081 6.1227 27.3068 5.89414 27.044 5.76273C26.7812 5.63131 26.4775 5.60738 26.1973 5.696C26.0594 5.7303 25.9298 5.79238 25.8167 5.87845C25.7035 5.96452 25.6091 6.07277 25.5392 6.19658C25.4693 6.32038 25.4254 6.45714 25.4102 6.59849C25.395 6.73985 25.4088 6.88282 25.4507 7.01867C27.0691 12.1656 28.0717 17.4863 28.4373 22.8693C28.4789 24.0519 28.429 25.2358 28.288 26.4107C25.9994 25.2604 24.026 23.5692 22.539 21.4836C21.0519 19.3981 20.0962 16.9812 19.7547 14.4427C19.7275 14.1559 19.5899 13.891 19.371 13.7038C19.152 13.5167 18.8688 13.4221 18.5813 13.44C18.2928 13.44 18.016 13.5546 17.812 13.7587C17.608 13.9627 17.4933 14.2394 17.4933 14.528C17.4507 14.9333 17.9627 23.4667 27.7333 28.6293C26.8772 31.6077 25.3522 34.3512 23.2747 36.6507C22.4775 37.5005 21.8221 38.4729 21.3333 39.5307C20.4601 41.7414 19.9278 44.072 19.7547 46.4427C19.6352 47.7242 19.4501 48.9988 19.2 50.2613C19.0785 50.8337 18.8622 51.3817 18.56 51.8827C17.3354 47.9788 16.3522 44.0033 15.616 39.9787C15.5581 38.927 15.5581 37.873 15.616 36.8213C18.287 35.9125 20.5528 34.0923 22.016 31.68C22.0887 31.5586 22.1349 31.4233 22.1516 31.2828C22.1682 31.1423 22.155 30.9998 22.1126 30.8648C22.0703 30.7298 21.9999 30.6053 21.9061 30.4995C21.8122 30.3936 21.697 30.3088 21.568 30.2507C21.3078 30.1133 21.0055 30.0788 20.721 30.1539C20.4365 30.2289 20.1906 30.4082 20.032 30.656C19.0012 32.3742 17.4564 33.725 15.616 34.5173C15.8293 30.976 16.2773 27.456 16.2773 27.4133C16.292 27.2715 16.2781 27.1281 16.2364 26.9918C16.1947 26.8554 16.126 26.7288 16.0345 26.6194C15.943 26.51 15.8306 26.42 15.7037 26.3549C15.5768 26.2897 15.4382 26.2507 15.296 26.24C15.0086 26.2024 14.7178 26.2767 14.4835 26.4474C14.2493 26.6181 14.0896 26.8722 14.0373 27.1573C13.4406 31.4749 13.2194 35.8362 13.376 40.192C13.5361 41.4282 13.7712 42.6536 14.08 43.8613C11.7674 42.8568 9.88547 41.0655 8.76801 38.8053C8.60686 38.5665 8.36482 38.3939 8.08647 38.3194C7.80813 38.2449 7.51225 38.2735 7.25334 38.4C7.12212 38.4528 7.00327 38.5323 6.90428 38.6333C6.8053 38.7344 6.72832 38.8549 6.67821 38.9872C6.6281 39.1194 6.60595 39.2607 6.61314 39.402C6.62033 39.5432 6.65672 39.6815 6.72001 39.808C7.52116 41.4023 8.64059 42.8155 10.0092 43.9603C11.3778 45.1051 12.9666 45.9572 14.6773 46.464C15.4667 49.5147 16.384 52.5653 16.8107 53.9307C16.3659 54.2475 15.8864 54.5124 15.3813 54.72C15.662 54.6221 15.9611 54.5885 16.2565 54.6218C16.5519 54.655 16.8361 54.7542 17.088 54.912C17.9413 55.36 18.816 56.512 18.4747 57.0453C18.4747 57.152 18.3253 57.1947 18.2613 57.2587C19.6204 56.6827 20.8217 55.7893 21.7644 54.6535C22.7072 53.5177 23.3641 52.1726 23.68 50.7307C23.9787 49.216 24.128 47.9787 24.256 46.8053C24.3939 44.6102 24.8762 42.4505 25.6853 40.4053C25.8839 39.9379 26.1344 39.4942 26.432 39.0827C29.5174 37.6155 32.3479 35.6636 34.816 33.3013C40.0688 32.922 45.2913 34.3689 49.6 37.3973C49.7998 37.5378 50.0385 37.6123 50.2827 37.6107C50.4546 37.6124 50.6247 37.5748 50.78 37.5009C50.9353 37.427 51.0716 37.3186 51.1787 37.184C51.2704 37.0761 51.3376 36.9496 51.3759 36.8132C51.4141 36.6769 51.4223 36.5339 51.4 36.394C51.3777 36.2542 51.3254 36.1208 51.2467 36.0031C51.168 35.8853 51.0647 35.786 50.944 35.712C46.8833 32.8808 42.0889 31.2876 37.1413 31.1253C38.3181 30.0923 39.6593 29.2631 41.1093 28.672C43.9801 30.0502 47.1431 30.7091 50.3253 30.592C51.924 30.5837 53.5204 30.4696 55.104 30.2507C55.2464 30.2375 55.3846 30.1958 55.5106 30.1281C55.6365 30.0604 55.7475 29.9681 55.8371 29.8567C55.9266 29.7453 55.9929 29.6169 56.0319 29.4794C56.0708 29.3418 56.0818 29.1979 56.064 29.056C56.0023 28.7731 55.8363 28.5239 55.5991 28.3578C55.3619 28.1918 55.0709 28.1212 54.784 28.16C51.3169 28.6553 47.7883 28.5107 44.3733 27.7333C45.7813 27.4987 47.3173 27.392 49.1733 27.264C51.0293 27.136 53.8027 26.944 56.832 26.56C56.9744 26.5468 57.1126 26.5051 57.2386 26.4375C57.3645 26.3698 57.4755 26.2775 57.5651 26.166C57.6546 26.0546 57.7209 25.9263 57.7599 25.7887C57.7988 25.6512 57.8098 25.5072 57.792 25.3653C57.7351 25.0813 57.5693 24.8307 57.3302 24.6673C57.091 24.5038 56.7973 24.4405 56.512 24.4907Z" fill="white"/>
-<path d="M17.9201 56.8107C17.6428 57.1733 16.6401 57.024 16.0214 56.5973C15.4028 56.1707 15.1468 55.5307 15.4241 55.1467C15.7014 54.7627 16.4694 54.8267 17.0881 55.1467C17.7068 55.4667 18.2188 56.448 17.9201 56.8107Z" fill="white"/>
+<path d="M56.512 24.4907C53.568 24.8747 51.1573 25.0453 49.024 25.1733C42.752 25.6 38.9547 25.856 33.344 31.5733C32.0602 32.8927 30.6285 34.0595 29.0773 35.0507C30.0442 33.2238 30.8165 31.3003 31.3813 29.312C31.7721 27.6857 31.8803 26.0043 31.7013 24.3413V23.4667C31.7013 22.976 31.7013 22.4853 31.7013 21.9733C32.3413 20.9493 33.2373 19.5627 34.1973 18.1547H35.2213C38.1837 18.2345 41.1184 17.5668 43.7547 16.2133C43.879 16.1471 43.9882 16.0559 44.0757 15.9455C44.1632 15.8351 44.2269 15.7079 44.2629 15.5717C44.299 15.4356 44.3065 15.2934 44.2852 15.1542C44.2638 15.015 44.2139 14.8817 44.1387 14.7627C43.9667 14.524 43.7126 14.3572 43.4253 14.2942C43.1379 14.2312 42.8374 14.2765 42.5813 14.4213C40.4059 15.5175 37.9985 16.0737 35.5627 16.0427C35.6278 15.9406 35.6849 15.8336 35.7333 15.7227C36.608 14.08 36.416 10.9013 37.9733 10.5813C38.1125 10.5558 38.2453 10.5028 38.3638 10.4254C38.4823 10.3481 38.5843 10.2479 38.6637 10.1308C38.7431 10.0136 38.7984 9.88183 38.8264 9.7431C38.8544 9.60436 38.8545 9.46144 38.8267 9.32267C38.7929 9.15125 38.7198 8.99 38.6132 8.85157C38.5066 8.71314 38.3694 8.6013 38.2123 8.52483C38.0552 8.44835 37.8825 8.40932 37.7078 8.41079C37.5331 8.41227 37.3611 8.45421 37.2053 8.53333C34.5173 9.06667 34.304 13.1413 33.4293 14.784C33.0944 15.4478 32.7167 16.0891 32.2987 16.704C31.872 17.3227 31.4453 17.9627 31.0613 18.56C30.3194 14.6163 29.205 10.7519 27.7333 7.01867L27.6053 6.4C27.5081 6.1227 27.3068 5.89414 27.044 5.76273C26.7812 5.63131 26.4775 5.60738 26.1973 5.696C26.0594 5.7303 25.9298 5.79238 25.8167 5.87845C25.7035 5.96452 25.6091 6.07277 25.5392 6.19658C25.4693 6.32038 25.4254 6.45714 25.4102 6.59849C25.395 6.73985 25.4088 6.88282 25.4507 7.01867C27.0691 12.1656 28.0717 17.4863 28.4373 22.8693C28.4789 24.0519 28.429 25.2358 28.288 26.4107C25.9994 25.2604 24.026 23.5692 22.539 21.4836C21.0519 19.3981 20.0962 16.9812 19.7547 14.4427C19.7275 14.1559 19.5899 13.891 19.371 13.7038C19.152 13.5167 18.8688 13.4221 18.5813 13.44C18.2928 13.44 18.016 13.5546 17.812 13.7587C17.608 13.9627 17.4933 14.2394 17.4933 14.528C17.4507 14.9333 17.9627 23.4667 27.7333 28.6293C26.8772 31.6077 25.3522 34.3512 23.2747 36.6507C22.4775 37.5005 21.8221 38.4729 21.3333 39.5307C20.4601 41.7414 19.9278 44.072 19.7547 46.4427C19.6352 47.7242 19.4501 48.9988 19.2 50.2613C19.0785 50.8337 18.8622 51.3817 18.56 51.8827C17.3354 47.9788 16.3522 44.0033 15.616 39.9787C15.5581 38.927 15.5581 37.873 15.616 36.8213C18.287 35.9125 20.5528 34.0923 22.016 31.68C22.0887 31.5586 22.1349 31.4233 22.1516 31.2828C22.1682 31.1423 22.155 30.9998 22.1126 30.8648C22.0703 30.7298 21.9999 30.6053 21.9061 30.4995C21.8122 30.3936 21.697 30.3088 21.568 30.2507C21.3078 30.1133 21.0055 30.0788 20.721 30.1539C20.4365 30.2289 20.1906 30.4082 20.032 30.656C19.0012 32.3742 17.4564 33.725 15.616 34.5173C15.8293 30.976 16.2773 27.456 16.2773 27.4133C16.292 27.2715 16.2781 27.1281 16.2364 26.9918C16.1947 26.8554 16.126 26.7288 16.0345 26.6194C15.943 26.51 15.8306 26.42 15.7037 26.3549C15.5768 26.2897 15.4382 26.2507 15.296 26.24C15.0086 26.2024 14.7178 26.2767 14.4835 26.4474C14.2493 26.6181 14.0896 26.8722 14.0373 27.1573C13.4406 31.4749 13.2194 35.8362 13.376 40.192C13.5361 41.4282 13.7712 42.6536 14.08 43.8613C11.7674 42.8568 9.88547 41.0655 8.76801 38.8053C8.60686 38.5665 8.36482 38.3939 8.08647 38.3194C7.80813 38.2449 7.51225 38.2735 7.25334 38.4C7.12212 38.4528 7.00327 38.5323 6.90428 38.6333C6.8053 38.7344 6.72832 38.8549 6.67821 38.9872C6.6281 39.1194 6.60595 39.2607 6.61314 39.402C6.62033 39.5432 6.65672 39.6815 6.72001 39.808C7.52116 41.4023 8.64059 42.8155 10.0092 43.9603C11.3778 45.1051 12.9666 45.9572 14.6773 46.464C15.4667 49.5147 16.384 52.5653 16.8107 53.9307C16.3659 54.2475 15.8864 54.5124 15.3813 54.72C15.662 54.6221 15.9611 54.5885 16.2565 54.6218C16.5519 54.655 16.8361 54.7542 17.088 54.912C17.9413 55.36 18.816 56.512 18.4747 57.0453C18.4747 57.152 18.3253 57.1947 18.2613 57.2587C19.6204 56.6827 20.8217 55.7893 21.7644 54.6535C22.7072 53.5177 23.3641 52.1726 23.68 50.7307C23.9787 49.216 24.128 47.9787 24.256 46.8053C24.3939 44.6102 24.8762 42.4505 25.6853 40.4053C25.8839 39.9379 26.1344 39.4942 26.432 39.0827C29.5174 37.6155 32.3479 35.6636 34.816 33.3013C40.0688 32.922 45.2913 34.3689 49.6 37.3973C49.7998 37.5378 50.0385 37.6123 50.2827 37.6107C50.4546 37.6124 50.6247 37.5748 50.78 37.5009C50.9353 37.427 51.0716 37.3186 51.1787 37.184C51.2704 37.0761 51.3376 36.9496 51.3759 36.8132C51.4141 36.6769 51.4223 36.5339 51.4 36.394C51.3777 36.2542 51.3254 36.1208 51.2467 36.0031C51.168 35.8853 51.0647 35.786 50.944 35.712C46.8833 32.8808 42.0889 31.2876 37.1413 31.1253C38.3181 30.0923 39.6593 29.2631 41.1093 28.672C43.9801 30.0502 47.1431 30.7091 50.3253 30.592C51.924 30.5837 53.5204 30.4696 55.104 30.2507C55.2464 30.2375 55.3846 30.1958 55.5106 30.1281C55.6365 30.0604 55.7475 29.9681 55.8371 29.8567C55.9266 29.7453 55.9929 29.6169 56.0319 29.4794C56.0708 29.3418 56.0818 29.1979 56.064 29.056C56.0023 28.7731 55.8363 28.5239 55.5991 28.3578C55.3619 28.1918 55.0709 28.1212 54.784 28.16C51.3169 28.6553 47.7883 28.5107 44.3733 27.7333C45.7813 27.4987 47.3173 27.392 49.1733 27.264C51.0293 27.136 53.8027 26.944 56.832 26.56C56.9744 26.5468 57.1126 26.5051 57.2386 26.4375C57.3645 26.3698 57.4755 26.2775 57.5651 26.166C57.6546 26.0546 57.7209 25.9263 57.7599 25.7887C57.7988 25.6512 57.8098 25.5072 57.792 25.3653C57.7351 25.0813 57.5693 24.8307 57.3302 24.6673C57.091 24.5038 56.7973 24.4405 56.512 24.4907Z" />
+<path d="M17.9201 56.8107C17.6428 57.1733 16.6401 57.024 16.0214 56.5973C15.4028 56.1707 15.1468 55.5307 15.4241 55.1467C15.7014 54.7627 16.4694 54.8267 17.0881 55.1467C17.7068 55.4667 18.2188 56.448 17.9201 56.8107Z" />
 </g>
 <defs>
 <clipPath id="clip0_1795_459">
-<rect width="64" height="64" fill="white"/>
+<rect width="64" height="64" />
 </clipPath>
 </defs>
 </svg>