diff --git a/extensions/cornerstone/src/components/DicomUpload/DicomUploadProgressItem.tsx b/extensions/cornerstone/src/components/DicomUpload/DicomUploadProgressItem.tsx
index 0ebcff89a8f..3e06a84b56a 100644
--- a/extensions/cornerstone/src/components/DicomUpload/DicomUploadProgressItem.tsx
+++ b/extensions/cornerstone/src/components/DicomUpload/DicomUploadProgressItem.tsx
@@ -60,11 +60,11 @@ const DicomUploadProgressItem = memo(
             />
           );
         case UploadStatus.InProgress:
-          return <Icons.ByName name="icon-transferring" />;
+          return <Icons.ByName name="icon-transferring" className="text-highlight" />;
         case UploadStatus.Failed:
-          return <Icons.ByName name="icon-alert-small" />;
+          return <Icons.ByName name="icon-alert-small" className="text-destructive" />;
         case UploadStatus.Cancelled:
-          return <Icons.ByName name="icon-alert-outline" />;
+          return <Icons.ByName name="icon-alert-outline" className="text-highlight" />;
         default:
           return <></>;
       }
diff --git a/extensions/cornerstone/src/components/TrackingStatus/TrackingStatus.tsx b/extensions/cornerstone/src/components/TrackingStatus/TrackingStatus.tsx
index 148e7771706..a2aeb6a32df 100644
--- a/extensions/cornerstone/src/components/TrackingStatus/TrackingStatus.tsx
+++ b/extensions/cornerstone/src/components/TrackingStatus/TrackingStatus.tsx
@@ -18,7 +18,7 @@ function TrackingStatus({ viewportId }: { viewportId: string }) {
       <Tooltip>
         <TooltipTrigger asChild>
           <span>
-            <Icons.StatusTracking className="h-4 w-4" />
+            <Icons.StatusTracking className="h-4 w-4 text-highlight" />
           </span>
         </TooltipTrigger>
         <TooltipContent side="bottom">
diff --git a/extensions/default/src/Components/DataSourceConfigurationModalComponent.tsx b/extensions/default/src/Components/DataSourceConfigurationModalComponent.tsx
index 28398eeb392..4e2cb97707c 100644
--- a/extensions/default/src/Components/DataSourceConfigurationModalComponent.tsx
+++ b/extensions/default/src/Components/DataSourceConfigurationModalComponent.tsx
@@ -152,7 +152,7 @@ function DataSourceConfigurationModalComponent({
             >
               <div className="text- flex items-center gap-2">
                 {itemLabelIndex < selectedItems.length ? (
-                  <Icons.ByName name="status-tracked" />
+                  <Icons.ByName name="status-tracked" className="text-highlight" />
                 ) : (
                   <Icons.ByName name="status-untracked" />
                 )}
diff --git a/extensions/default/src/DicomTagBrowser/DicomTagBrowser.css b/extensions/default/src/DicomTagBrowser/DicomTagBrowser.css
index 1a2f681c0c4..3dd18fcf10c 100644
--- a/extensions/default/src/DicomTagBrowser/DicomTagBrowser.css
+++ b/extensions/default/src/DicomTagBrowser/DicomTagBrowser.css
@@ -12,8 +12,7 @@
 .dicom-tag-browser-table tr {
   padding-left: 10px;
   padding-right: 10px;
-  color: #ffffff;
-  border-top: 1px solid #ddd;
+  color: hsl(var(--foreground));
   white-space: nowrap;
 }
 
@@ -43,7 +42,6 @@
   padding-left: 10px;
   padding-right: 10px;
   text-align: center;
-  color: '#20A5D6';
 }
 
 .dicom-tag-browser-table th.dicom-tag-browser-table-left {
diff --git a/extensions/default/src/utils/colorPickerDialog.css b/extensions/default/src/utils/colorPickerDialog.css
index 1c6bb206701..34f3992a81c 100644
--- a/extensions/default/src/utils/colorPickerDialog.css
+++ b/extensions/default/src/utils/colorPickerDialog.css
@@ -1,3 +1,4 @@
 .chrome-picker {
-  background: #090c29 !important;
+  background: transparent !important;
+  box-shadow: none !important;
 }
diff --git a/platform/app/src/routes/NotFound/NotFound.tsx b/platform/app/src/routes/NotFound/NotFound.tsx
index b5553ec8880..14896da3978 100644
--- a/platform/app/src/routes/NotFound/NotFound.tsx
+++ b/platform/app/src/routes/NotFound/NotFound.tsx
@@ -15,7 +15,7 @@ const NotFound = ({
   return (
     <div className="absolute flex h-full w-full items-center justify-center bg-background">
       <div className="flex flex-col">
-        <div className="bg-background flex items-center justify-center rounded-t-2xl p-6">
+        <div className="bg-background flex items-center justify-center rounded-t-2xl p-6 text-primary">
           <Icons.IllustrationNotFound />
         </div>
         <div className="bg-input h-px" />
diff --git a/platform/app/src/routes/WorkList/StudyListSettingsPopover.tsx b/platform/app/src/routes/WorkList/StudyListSettingsPopover.tsx
index 0bc367aa546..0aded13cb02 100644
--- a/platform/app/src/routes/WorkList/StudyListSettingsPopover.tsx
+++ b/platform/app/src/routes/WorkList/StudyListSettingsPopover.tsx
@@ -107,7 +107,7 @@ export function StudyListSettingsPopover() {
         >
           <Icons.SettingsStudyList
             aria-hidden="true"
-            className="h-4 w-4"
+            className="text-primary h-4 w-4"
           />
         </Button>
       </StudyList.SettingsPopover.Trigger>
diff --git a/platform/app/src/routes/WorkList/WorkList.tsx b/platform/app/src/routes/WorkList/WorkList.tsx
index 88c6509f7eb..0f3e4380116 100644
--- a/platform/app/src/routes/WorkList/WorkList.tsx
+++ b/platform/app/src/routes/WorkList/WorkList.tsx
@@ -107,7 +107,7 @@ export default function WorkList({
               isLoading={showStudyListLoading}
               loadingComponent={
                 LoadingIndicatorProgress ? (
-                  <LoadingIndicatorProgress className="!relative bg-black" />
+                  <LoadingIndicatorProgress className="bg-background !relative" />
                 ) : (
                   <div className="h-8 w-8" />
                 )
diff --git a/platform/ui-next/src/assets/styles.css b/platform/ui-next/src/assets/styles.css
index 3e339f9bb35..a0199ea89d5 100644
--- a/platform/ui-next/src/assets/styles.css
+++ b/platform/ui-next/src/assets/styles.css
@@ -1,6 +1,6 @@
 /* CUSTOM OHIF SCROLLBAR */
 .ohif-scrollbar {
-  scrollbar-color: #173239 transparent;
+  scrollbar-color: hsl(var(--neutral) / 0.5) transparent;
   overflow-y: auto;
 }
 
@@ -27,12 +27,10 @@
 .ohif-scrollbar::-webkit-scrollbar-thumb {
   @apply rounded;
   @apply bg-popover;
-  background-color: #041c4a;
 }
 
 .ohif-scrollbar::-webkit-scrollbar-thumb:window-inactive {
   @apply bg-popover;
-  background-color: #041c4a;
 }
 
 /* INVISIBLE SCROLLBAR */
diff --git a/platform/ui-next/src/components/DateRange/DateRange.tsx b/platform/ui-next/src/components/DateRange/DateRange.tsx
index 90ba7034120..7bd18e40314 100644
--- a/platform/ui-next/src/components/DateRange/DateRange.tsx
+++ b/platform/ui-next/src/components/DateRange/DateRange.tsx
@@ -94,7 +94,7 @@ export function DatePickerWithRange({
               value={start}
               onChange={e => handleInputChange(e, 'start')}
               className={cn(
-                'border-inputfield-main focus:border-inputfield-focus hover:text-foreground placeholder:text-muted-foreground h-7 w-full justify-start rounded border bg-background pl-1.5 pr-0.5 py-1 text-left text-base font-normal hover:bg-background'
+                'border-input focus:border-ring hover:text-foreground placeholder:text-muted-foreground h-7 w-full justify-start rounded border bg-background pl-1.5 pr-0.5 py-1 text-left text-base font-normal hover:bg-background'
               )}
               data-cy="input-date-range-start"
             />
@@ -135,7 +135,7 @@ export function DatePickerWithRange({
               value={end}
               onChange={e => handleInputChange(e, 'end')}
               className={cn(
-                'border-inputfield-main focus:border-inputfield-focus hover:text-foreground placeholder:text-muted-foreground h-7 w-full justify-start rounded border bg-background pl-1.5 pr-0.5 py-1 text-left text-base font-normal hover:bg-background'
+                'border-input focus:border-ring hover:text-foreground placeholder:text-muted-foreground h-7 w-full justify-start rounded border bg-background pl-1.5 pr-0.5 py-1 text-left text-base font-normal hover:bg-background'
               )}
               data-cy="input-date-range-end"
             />
diff --git a/platform/ui-next/src/components/Icons/Sources/Alert.tsx b/platform/ui-next/src/components/Icons/Sources/Alert.tsx
index 50b544327a6..edbe5f0e36c 100644
--- a/platform/ui-next/src/components/Icons/Sources/Alert.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/Alert.tsx
@@ -15,7 +15,7 @@ export const Alert = (props: IconProps) => (
     >
       <path
         d="M24 11.794c.017 6.667-5.333 12.108-12 12.205a11.823 11.823 0 0 1-12-11.79C-.019 5.541 5.331.1 12 .001a11.824 11.824 0 0 1 12 11.793z"
-        fill="#B70D11"
+        fill="currentColor"
       />
       <g
         stroke="#FFF"
diff --git a/platform/ui-next/src/components/Icons/Sources/AlertOutline.tsx b/platform/ui-next/src/components/Icons/Sources/AlertOutline.tsx
index c7e5883b283..802c788735b 100644
--- a/platform/ui-next/src/components/Icons/Sources/AlertOutline.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/AlertOutline.tsx
@@ -10,7 +10,7 @@ export const AlertOutline = (props: IconProps) => (
     {...props}
   >
     <g
-      stroke="#5ACCE6"
+      stroke="currentColor"
       fill="none"
       fillRule="evenodd"
       strokeLinecap="round"
diff --git a/platform/ui-next/src/components/Icons/Sources/ContentNext.tsx b/platform/ui-next/src/components/Icons/Sources/ContentNext.tsx
index 7c4fbba1167..51ef8d73be0 100644
--- a/platform/ui-next/src/components/Icons/Sources/ContentNext.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/ContentNext.tsx
@@ -20,7 +20,7 @@ export const ContentNext = (props: IconProps) => (
       <g
         id="Artboard"
         transform="translate(-460, -343)"
-        fill="#FFFFFF"
+        fill="currentColor"
       >
         <polygon
           id="chevron-next"
diff --git a/platform/ui-next/src/components/Icons/Sources/ContentPrev.tsx b/platform/ui-next/src/components/Icons/Sources/ContentPrev.tsx
index c25ad6e8352..0810047c7f3 100644
--- a/platform/ui-next/src/components/Icons/Sources/ContentPrev.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/ContentPrev.tsx
@@ -20,7 +20,7 @@ export const ContentPrev = (props: IconProps) => (
       <g
         id="Artboard"
         transform="translate(-435, -343)"
-        fill="#FFFFFF"
+        fill="currentColor"
       >
         <polygon
           id="chevron-prev"
diff --git a/platform/ui-next/src/components/Icons/Sources/Helpers.tsx b/platform/ui-next/src/components/Icons/Sources/Helpers.tsx
index c1fa3cc4d37..3de07b0add8 100644
--- a/platform/ui-next/src/components/Icons/Sources/Helpers.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/Helpers.tsx
@@ -11,96 +11,96 @@ export const HelperCombineSubtract = (props: IconProps) => (
   >
     <path
       d="M17.6459 47.0208C17.1265 47.0208 16.6284 46.8145 16.2611 46.4472C15.8939 46.08 15.6875 45.5819 15.6875 45.0625"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M45.0625 47.0208C45.5819 47.0208 46.08 46.8145 46.4473 46.4472C46.8146 46.08 47.0209 45.5819 47.0209 45.0625"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M15.6875 41.1458V39.1875"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M23.5209 47.0208H21.5625"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M29.3959 47.0208H27.4375"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M35.2709 47.0208H33.3125"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M41.1459 47.0208H39.1875"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M41.1459 15.6875H39.1875"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M45.0625 15.6875C45.5819 15.6875 46.08 15.8938 46.4473 16.2611C46.8146 16.6283 47.0209 17.1264 47.0209 17.6458"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M47.0209 21.5625V23.5208"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M47.0209 27.4375V29.3958"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M47.0209 33.3125V35.2708"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M47.0209 39.1875V41.1458"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M3.93787 35.7708C3.28603 35.7708 2.66058 35.5119 2.19958 35.0511C1.73863 34.5901 1.47897 33.9647 1.47888 33.3128L1.47888 3.93781C1.47888 3.28582 1.73856 2.66055 2.19958 2.19952C2.66061 1.7385 3.28588 1.47882 3.93787 1.47882L33.3129 1.47882C33.9647 1.47891 34.5902 1.73857 35.0511 2.19952C35.512 2.66052 35.7709 3.28597 35.7709 3.93781L35.7709 13.7288C35.7709 14.3807 35.512 15.0061 35.0511 15.4671C34.5902 15.9281 33.9647 16.1877 33.3129 16.1878L17.6459 16.1878C17.2591 16.1878 16.8881 16.3411 16.6146 16.6146C16.3411 16.8881 16.1879 17.259 16.1879 17.6458L16.1879 33.3128C16.1878 33.9647 15.9281 34.5901 15.4672 35.0511C15.0062 35.5119 14.3807 35.7708 13.7289 35.7708L3.93787 35.7708Z"
-      fill="#1A3F7E"
-      stroke="white"
+      fill="hsl(var(--accent))"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M6.53267 16H5.33239L8.80398 6.54545H9.9858L13.4574 16H12.2571L9.43182 8.04119H9.35795L6.53267 16ZM6.97585 12.3068H11.8139V13.3224H6.97585V12.3068Z"
-      fill="white"
+      fill="currentColor"
     />
     <path
       d="M28.1449 36V26.5455H31.4503C32.1089 26.5455 32.6521 26.6593 33.0799 26.8871C33.5077 27.1117 33.8262 27.4149 34.0355 27.7965C34.2448 28.1751 34.3494 28.5952 34.3494 29.0568C34.3494 29.4631 34.2771 29.7985 34.1325 30.0632C33.9909 30.3279 33.8031 30.5372 33.5692 30.6911C33.3384 30.8449 33.0876 30.9588 32.8168 31.0327V31.125C33.1061 31.1435 33.3969 31.245 33.6893 31.4297C33.9817 31.6143 34.2263 31.879 34.4233 32.2237C34.6203 32.5684 34.7188 32.9901 34.7188 33.4886C34.7188 33.9626 34.611 34.3888 34.3956 34.7674C34.1802 35.146 33.8401 35.446 33.3754 35.6676C32.9106 35.8892 32.3059 36 31.5611 36H28.1449ZM29.2898 34.9844H31.5611C32.3089 34.9844 32.8398 34.8397 33.1538 34.5504C33.4708 34.258 33.6293 33.9041 33.6293 33.4886C33.6293 33.1686 33.5477 32.8731 33.3846 32.6023C33.2215 32.3284 32.9891 32.1098 32.6875 31.9467C32.3859 31.7805 32.0289 31.6974 31.6165 31.6974H29.2898V34.9844ZM29.2898 30.7003H31.4134C31.758 30.7003 32.0689 30.6326 32.3459 30.4972C32.6259 30.3617 32.8475 30.1709 33.0107 29.9247C33.1768 29.6785 33.2599 29.3892 33.2599 29.0568C33.2599 28.6413 33.1153 28.2889 32.826 27.9996C32.5367 27.7073 32.0781 27.5611 31.4503 27.5611H29.2898V30.7003Z"
-      fill="white"
+      fill="currentColor"
     />
   </svg>
 );
@@ -115,198 +115,198 @@ export const HelperCombineIntersect = (props: IconProps) => (
   >
     <path
       d="M31.0625 3.9375C31.5598 3.9375 32.0367 4.13504 32.3883 4.48667C32.74 4.83831 32.9375 5.31522 32.9375 5.8125"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M4.8125 3.9375C4.31522 3.9375 3.83831 4.13504 3.48667 4.48667C3.13504 4.83831 2.9375 5.31522 2.9375 5.8125"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M32.9375 9.5625V11.4375"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M25.4375 3.9375H27.3125"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M19.8125 3.9375H21.6875"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M14.1875 3.9375H16.0625"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M8.5625 3.9375H10.4375"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M14.1875 33.9375H16.0625"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M8.5625 33.9375H10.4375"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M4.8125 33.9375C4.31522 33.9375 3.83831 33.74 3.48667 33.3883C3.13504 33.0367 2.9375 32.5598 2.9375 32.0625"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M2.9375 28.3125V26.4375"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M2.9375 22.6875V20.8125"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M2.9375 17.0625V15.1875"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M32.9375 17.0625V15.1875"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M2.9375 11.4375V9.5625"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M17.9375 47.0625C17.4402 47.0625 16.9633 46.865 16.6117 46.5133C16.26 46.1617 16.0625 45.6848 16.0625 45.1875"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M44.1875 47.0625C44.6848 47.0625 45.1617 46.865 45.5133 46.5133C45.865 46.1617 46.0625 45.6848 46.0625 45.1875"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M16.0625 41.4375V39.5625"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M23.5625 47.0625H21.6875"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M29.1875 47.0625H27.3125"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M34.8125 47.0625H32.9375"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M40.4375 47.0625H38.5625"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M34.8125 17.0625H32.9375"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M40.4375 17.0625H38.5625"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M44.1875 17.0625C44.6848 17.0625 45.1617 17.26 45.5133 17.6117C45.865 17.9633 46.0625 18.4402 46.0625 18.9375"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M46.0625 22.6875V24.5625"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M46.0625 28.3125V30.1875"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M46.0625 33.9375V35.8125"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M16.0625 33.9375V35.8125"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M46.0625 39.5625V41.4375"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M16.0625 18.9375C16.0625 18.4402 16.26 17.9633 16.6117 17.6117C16.9633 17.26 17.4402 17.0625 17.9375 17.0625H32.9375V32.0625C32.9375 32.5598 32.74 33.0367 32.3883 33.3883C32.0367 33.74 31.5598 33.9375 31.0625 33.9375H16.0625V18.9375Z"
-      fill="#1A3F7E"
-      stroke="white"
+      fill="hsl(var(--accent))"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M6.53267 16H5.33239L8.80398 6.54545H9.9858L13.4574 16H12.2571L9.43182 8.04119H9.35795L6.53267 16ZM6.97585 12.3068H11.8139V13.3224H6.97585V12.3068Z"
-      fill="white"
+      fill="currentColor"
     />
     <path
       d="M36.1449 43V33.5455H39.4503C40.1089 33.5455 40.6521 33.6593 41.0799 33.8871C41.5077 34.1117 41.8262 34.4149 42.0355 34.7965C42.2448 35.1751 42.3494 35.5952 42.3494 36.0568C42.3494 36.4631 42.2771 36.7985 42.1325 37.0632C41.9909 37.3279 41.8031 37.5372 41.5692 37.6911C41.3384 37.8449 41.0876 37.9588 40.8168 38.0327V38.125C41.1061 38.1435 41.3969 38.245 41.6893 38.4297C41.9817 38.6143 42.2263 38.879 42.4233 39.2237C42.6203 39.5684 42.7188 39.9901 42.7188 40.4886C42.7188 40.9626 42.611 41.3888 42.3956 41.7674C42.1802 42.146 41.8401 42.446 41.3754 42.6676C40.9106 42.8892 40.3059 43 39.5611 43H36.1449ZM37.2898 41.9844H39.5611C40.3089 41.9844 40.8398 41.8397 41.1538 41.5504C41.4708 41.258 41.6293 40.9041 41.6293 40.4886C41.6293 40.1686 41.5477 39.8731 41.3846 39.6023C41.2215 39.3284 40.9891 39.1098 40.6875 38.9467C40.3859 38.7805 40.0289 38.6974 39.6165 38.6974H37.2898V41.9844ZM37.2898 37.7003H39.4134C39.758 37.7003 40.0689 37.6326 40.3459 37.4972C40.6259 37.3617 40.8475 37.1709 41.0107 36.9247C41.1768 36.6785 41.2599 36.3892 41.2599 36.0568C41.2599 35.6413 41.1153 35.2889 40.826 34.9996C40.5367 34.7073 40.0781 34.5611 39.4503 34.5611H37.2898V37.7003Z"
-      fill="white"
+      fill="currentColor"
     />
   </svg>
 );
@@ -321,78 +321,78 @@ export const HelperCombineMerge = (props: IconProps) => (
   >
     <path
       d="M5.79167 32.5625C5.31649 32.5625 4.86077 32.3737 4.52477 32.0377C4.18876 31.7017 4 31.246 4 30.7708V5.68748C4 5.2123 4.18876 4.75658 4.52477 4.42058C4.86077 4.08458 5.31649 3.89581 5.79167 3.89581H30.875C31.3502 3.89581 31.8059 4.08458 32.1419 4.42058C32.4779 4.75658 32.6667 5.2123 32.6667 5.68748V16.4375H43.4167C43.8918 16.4375 44.3476 16.6262 44.6836 16.9622C45.0196 17.2982 45.2083 17.754 45.2083 18.2291V43.3125C45.2083 43.7877 45.0196 44.2434 44.6836 44.5794C44.3476 44.9154 43.8918 45.1041 43.4167 45.1041H18.3333C17.8582 45.1041 17.4024 44.9154 17.0664 44.5794C16.7304 44.2434 16.5417 43.7877 16.5417 43.3125V32.5625H5.79167Z"
-      fill="#1A3F7E"
-      stroke="white"
+      fill="hsl(var(--accent))"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M18.3333 16.4375C17.8581 16.4375 17.4024 16.6263 17.0664 16.9623C16.7304 17.2983 16.5416 17.754 16.5416 18.2292"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M16.5416 21.8125V23.6042"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M23.7083 16.4375H21.9166"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M29.0833 16.4375H27.2916"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M21.9167 32.5625H20.125"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M27.2917 32.5625H25.5"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M16.5416 28.9792V27.1875"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M32.6666 20.0208V21.8125"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M30.875 32.5625C31.3502 32.5625 31.8059 32.3737 32.1419 32.0377C32.4779 31.7017 32.6667 31.246 32.6667 30.7708"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M32.6666 27.1875V25.3958"
-      stroke="white"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M7.6368 16H6.43651L9.9081 6.54545H11.0899L14.5615 16H13.3612L10.5359 8.04119H10.4621L7.6368 16ZM8.07998 12.3068H12.918V13.3224H8.07998V12.3068Z"
-      fill="white"
+      fill="currentColor"
     />
     <path
       d="M36.249 42V32.5455H39.5544C40.213 32.5455 40.7562 32.6593 41.184 32.8871C41.6118 33.1117 41.9304 33.4149 42.1396 33.7965C42.3489 34.1751 42.4536 34.5952 42.4536 35.0568C42.4536 35.4631 42.3812 35.7985 42.2366 36.0632C42.095 36.3279 41.9073 36.5372 41.6734 36.6911C41.4425 36.8449 41.1917 36.9588 40.9209 37.0327V37.125C41.2102 37.1435 41.501 37.245 41.7934 37.4297C42.0858 37.6143 42.3305 37.879 42.5274 38.2237C42.7244 38.5684 42.8229 38.9901 42.8229 39.4886C42.8229 39.9626 42.7152 40.3888 42.4997 40.7674C42.2843 41.146 41.9442 41.446 41.4795 41.6676C41.0148 41.8892 40.41 42 39.6652 42H36.249ZM37.3939 40.9844H39.6652C40.4131 40.9844 40.944 40.8397 41.2579 40.5504C41.5749 40.258 41.7334 39.9041 41.7334 39.4886C41.7334 39.1686 41.6518 38.8731 41.4887 38.6023C41.3256 38.3284 41.0932 38.1098 40.7916 37.9467C40.49 37.7805 40.133 37.6974 39.7206 37.6974H37.3939V40.9844ZM37.3939 36.7003H39.5175C39.8622 36.7003 40.173 36.6326 40.45 36.4972C40.7301 36.3617 40.9517 36.1709 41.1148 35.9247C41.281 35.6785 41.3641 35.3892 41.3641 35.0568C41.3641 34.6413 41.2194 34.2889 40.9301 33.9996C40.6408 33.7073 40.1823 33.5611 39.5544 33.5611H37.3939V36.7003Z"
-      fill="white"
+      fill="currentColor"
     />
   </svg>
 );
diff --git a/platform/ui-next/src/components/Icons/Sources/IconTransferring.tsx b/platform/ui-next/src/components/Icons/Sources/IconTransferring.tsx
index da551689cd2..60f3da98027 100644
--- a/platform/ui-next/src/components/Icons/Sources/IconTransferring.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/IconTransferring.tsx
@@ -10,7 +10,7 @@ export const IconTransferring = (props: IconProps) => (
     {...props}
   >
     <g
-      stroke="#5ACCE6"
+      stroke="currentColor"
       fill="none"
       fillRule="evenodd"
       strokeLinecap="round"
diff --git a/platform/ui-next/src/components/Icons/Sources/IllustrationNotFound.tsx b/platform/ui-next/src/components/Icons/Sources/IllustrationNotFound.tsx
index f6ff139e3be..0dd14ad6cbc 100644
--- a/platform/ui-next/src/components/Icons/Sources/IllustrationNotFound.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/IllustrationNotFound.tsx
@@ -13,7 +13,7 @@ export const IllustrationNotFound = (props: IconProps) => (
     <path
       opacity="0.4"
       d="M17 32.4628V22.0467C17 20.7096 17.5312 19.4272 18.4767 18.4817C19.4222 17.5362 20.7045 17.005 22.0417 17.005H32.4628"
-      stroke="#358CFD"
+      stroke="currentColor"
       strokeWidth="6"
       strokeLinecap="round"
       strokeLinejoin="round"
@@ -21,7 +21,7 @@ export const IllustrationNotFound = (props: IconProps) => (
     <path
       opacity="0.4"
       d="M32.4628 132.963H22.0417C20.7045 132.963 19.4222 132.432 18.4767 131.487C17.5312 130.541 17 129.259 17 127.922V117.501"
-      stroke="#358CFD"
+      stroke="currentColor"
       strokeWidth="6"
       strokeLinecap="round"
       strokeLinejoin="round"
@@ -29,7 +29,7 @@ export const IllustrationNotFound = (props: IconProps) => (
     <path
       opacity="0.4"
       d="M17 51.7875V67.2503"
-      stroke="#358CFD"
+      stroke="currentColor"
       strokeWidth="6"
       strokeLinecap="round"
       strokeLinejoin="round"
@@ -37,7 +37,7 @@ export const IllustrationNotFound = (props: IconProps) => (
     <path
       opacity="0.4"
       d="M17 82.7131V98.1708"
-      stroke="#358CFD"
+      stroke="currentColor"
       strokeWidth="6"
       strokeLinecap="round"
       strokeLinejoin="round"
@@ -45,7 +45,7 @@ export const IllustrationNotFound = (props: IconProps) => (
     <path
       opacity="0.4"
       d="M132.958 51.7875V67.2503"
-      stroke="#358CFD"
+      stroke="currentColor"
       strokeWidth="6"
       strokeLinecap="round"
       strokeLinejoin="round"
@@ -53,7 +53,7 @@ export const IllustrationNotFound = (props: IconProps) => (
     <path
       opacity="0.4"
       d="M51.7875 17H67.2503"
-      stroke="#358CFD"
+      stroke="currentColor"
       strokeWidth="6"
       strokeLinecap="round"
       strokeLinejoin="round"
@@ -61,7 +61,7 @@ export const IllustrationNotFound = (props: IconProps) => (
     <path
       opacity="0.4"
       d="M82.7081 17H98.1708"
-      stroke="#358CFD"
+      stroke="currentColor"
       strokeWidth="6"
       strokeLinecap="round"
       strokeLinejoin="round"
@@ -69,7 +69,7 @@ export const IllustrationNotFound = (props: IconProps) => (
     <path
       opacity="0.4"
       d="M117.496 17.005H127.917C129.254 17.005 130.536 17.5362 131.482 18.4817C132.427 19.4272 132.958 20.7096 132.958 22.0467V32.4628"
-      stroke="#358CFD"
+      stroke="currentColor"
       strokeWidth="6"
       strokeLinecap="round"
       strokeLinejoin="round"
@@ -77,21 +77,21 @@ export const IllustrationNotFound = (props: IconProps) => (
     <path
       opacity="0.4"
       d="M67.2503 132.958H51.7875"
-      stroke="#358CFD"
+      stroke="currentColor"
       strokeWidth="6"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M86.575 117.496C103.652 117.496 117.496 103.652 117.496 86.575C117.496 69.4981 103.652 55.6545 86.575 55.6545C69.4981 55.6545 55.6545 69.4981 55.6545 86.575C55.6545 103.652 69.4981 117.496 86.575 117.496Z"
-      stroke="#358CFD"
+      stroke="currentColor"
       strokeWidth="6"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M108.441 108.441L132.958 132.958"
-      stroke="#358CFD"
+      stroke="currentColor"
       strokeWidth="6"
       strokeLinecap="round"
       strokeLinejoin="round"
diff --git a/platform/ui-next/src/components/Icons/Sources/InvestigationalUse.tsx b/platform/ui-next/src/components/Icons/Sources/InvestigationalUse.tsx
index 65b5a7ab520..2824f46d9e9 100644
--- a/platform/ui-next/src/components/Icons/Sources/InvestigationalUse.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/InvestigationalUse.tsx
@@ -35,7 +35,7 @@ export const InvestigationalUse = (props: IconProps) => (
             >
               <rect
                 id="Rectangle"
-                fill="#090C29"
+                fill="hsl(var(--muted))"
                 opacity="0.900000036"
                 x="0"
                 y="0"
@@ -52,7 +52,7 @@ export const InvestigationalUse = (props: IconProps) => (
               >
                 <circle
                   id="Oval"
-                  stroke="#3A3F99"
+                  stroke="hsl(var(--input))"
                   cx="16.0737705"
                   cy="16.0737705"
                   r="16.0737705"
@@ -63,12 +63,12 @@ export const InvestigationalUse = (props: IconProps) => (
                   x2="27.295082"
                   y2="27.295082"
                   id="Path"
-                  stroke="#3A3F99"
+                  stroke="hsl(var(--input))"
                 ></line>
                 <path
                   d="M24.8688525,24.8688525 C24.8688525,24.8688525 21.6386587,23.455813 19.3807213,22.6273157 C17.8999493,22.0823767 18.1110313,19.6063894 18.968152,18.6765081 C20.4710303,17.2173856 21.2133915,15.1548596 20.9814262,13.0829629 C21.1101279,11.7283944 20.6465988,10.3841411 19.7082359,9.39065905 C18.7698729,8.39717696 17.4466768,7.84975339 16.0737705,7.88703309 C14.7011699,7.84980444 13.3782601,8.39701666 12.4399544,9.39013526 C11.5016487,10.3832539 11.0379007,11.7270704 11.1661148,13.0813788 C10.9341495,15.1532755 11.6765106,17.2158015 13.179389,18.6749239 C14.0365097,19.6048053 14.2475917,22.0807926 12.7668197,22.6257315 C10.5088823,23.4542289 7.27868852,24.8688525 7.27868852,24.8688525"
                   id="Path"
-                  stroke="#348CFD"
+                  stroke="hsl(var(--primary))"
                 ></path>
               </g>
             </g>
diff --git a/platform/ui-next/src/components/Icons/Sources/Layout.tsx b/platform/ui-next/src/components/Icons/Sources/Layout.tsx
index 958d26f8390..43ea5d7b4fe 100644
--- a/platform/ui-next/src/components/Icons/Sources/Layout.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/Layout.tsx
@@ -38,7 +38,7 @@ export const LayoutAdvanced3DFourUp = (props: IconProps) => (
         <path
           d="M13.8857143,0 L25,0 C26.1045695,-1.18396092e-15 27,0.8954305 27,2 L27,8.5 L27,8.5 L13.8857143,8.5 L13.8857143,0 Z"
           id="Rectangle"
-          fill="#263A71"
+          fill="hsl(var(--accent))"
         ></path>
         <path
           d="M0,8.48571429 L13.8857143,8.48571429 L13.8857143,14.2 C13.8857143,15.3045695 12.9902838,16.2 11.8857143,16.2 L0,16.2 L0,16.2 L0,8.48571429 Z"
@@ -94,7 +94,7 @@ export const LayoutAdvanced3DMain = (props: IconProps) => (
         <path
           d="M2,0 L25,0 C26.1045695,-2.02906125e-16 27,0.8954305 27,2 L27,8.48571429 L27,8.48571429 L0,8.48571429 L0,2 C-1.3527075e-16,0.8954305 0.8954305,1.3527075e-16 2,0 Z"
           id="Rectangle"
-          fill="#263A71"
+          fill="hsl(var(--accent))"
           transform="translate(13.5, 4.2429) scale(-1, 1) translate(-13.5, -4.2429)"
         ></path>
       </g>
@@ -121,11 +121,11 @@ export const LayoutAdvanced3DOnly = (props: IconProps) => (
       <g
         id="layout-advanced-3d-only"
         transform="translate(1, 1)"
-        fill="#263A71"
         stroke="currentColor"
       >
         <rect
           id="Rectangle"
+          fill="hsl(var(--accent))"
           x="0"
           y="0"
           width="27"
@@ -177,7 +177,7 @@ export const LayoutAdvanced3DPrimary = (props: IconProps) => (
         <path
           d="M0,0 L14.2,0 C15.3045695,-2.02906125e-16 16.2,0.8954305 16.2,2 L16.2,14.2 C16.2,15.3045695 15.3045695,16.2 14.2,16.2 L0,16.2 L0,16.2 L0,0 Z"
           id="Rectangle"
-          fill="#263A71"
+          fill="hsl(var(--accent))"
           transform="translate(8.1, 8.1) scale(-1, 1) translate(-8.1, -8.1)"
         ></path>
       </g>
diff --git a/platform/ui-next/src/components/Icons/Sources/LoadingSpinner.tsx b/platform/ui-next/src/components/Icons/Sources/LoadingSpinner.tsx
index 45b8fd22977..7a69e58ea10 100644
--- a/platform/ui-next/src/components/Icons/Sources/LoadingSpinner.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/LoadingSpinner.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import type { IconProps } from '../types';
 
-export const LoadingSpinner = (props: IconProps) => (
+export const LoadingSpinner = ({ className, ...props }: IconProps) => (
   <svg
     role="status"
     aria-label="Loading"
-    className={`h-5 w-5 animate-spin ${props.className}`}
+    className={`h-5 w-5 animate-spin ${className ?? ''}`}
     width="24px"
     height="24px"
     viewBox="0 0 24 24"
@@ -33,13 +33,13 @@ export const LoadingSpinner = (props: IconProps) => (
         <path
           d="M11,0 C17.0751322,0 22,4.92486775 22,11 C22,17.0751322 17.0751322,22 11,22 C4.92486775,22 0,17.0751322 0,11 C0,4.92486775 4.92486775,0 11,0 Z M11,2 C6.02943725,2 2,6.02943725 2,11 C2,15.9705627 6.02943725,20 11,20 C15.9705627,20 20,15.9705627 20,11 C20,6.02943725 15.9705627,2 11,2 Z"
           id="Oval"
-          fill="#348CFD"
+          fill="currentColor"
           opacity="0.25"
         ></path>
         <path
           d="M19.0287175,4.94590384 C19.5005019,4.65878387 20.1157155,4.80848402 20.4028355,5.28026847 C21.4419642,6.98772474 22,8.94986784 22,10.9915479 C22,17.0666801 17.0751322,21.9915479 11,21.9915479 C10.4477153,21.9915479 10,21.5438326 10,20.9915479 C10,20.4392631 10.4477153,19.9915479 11,19.9915479 C15.9705627,19.9915479 20,15.9621106 20,10.9915479 C20,9.31924154 19.5441371,7.7163545 18.6943528,6.32002184 C18.4072329,5.84823739 18.556933,5.2330238 19.0287175,4.94590384 Z"
           id="Oval"
-          fill="#5ACCE6"
+          fill="currentColor"
         ></path>
       </g>
     </g>
diff --git a/platform/ui-next/src/components/Icons/Sources/NotificationInfo.tsx b/platform/ui-next/src/components/Icons/Sources/NotificationInfo.tsx
index 8bf8dc11047..74fb8bc783f 100644
--- a/platform/ui-next/src/components/Icons/Sources/NotificationInfo.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/NotificationInfo.tsx
@@ -14,7 +14,7 @@ export const NotificationInfo = (props: IconProps) => (
       fillRule="evenodd"
     >
       <circle
-        fill="#0944B3"
+        fill="currentColor"
         cx="12"
         cy="12"
         r="12"
diff --git a/platform/ui-next/src/components/Icons/Sources/NotificationWarning.tsx b/platform/ui-next/src/components/Icons/Sources/NotificationWarning.tsx
index aafaa92eea7..ed53263d69b 100644
--- a/platform/ui-next/src/components/Icons/Sources/NotificationWarning.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/NotificationWarning.tsx
@@ -16,8 +16,8 @@ export const NotificationInfo = (props: IconProps) => (
       strokeLinejoin="round"
     >
       <path
-        fill="#F3DC43"
-        stroke="#F3DC43"
+        fill="currentColor"
+        stroke="currentColor"
         d="M1.217 5.076L5.54.751c.391-.39 1.024-.39 1.415 0l4.324 4.325c.391.39.391 1.024 0 1.414l-4.324 4.325c-.39.39-1.024.39-1.415 0L1.217 6.49c-.39-.39-.39-1.023 0-1.414z"
         transform="translate(0 1)"
       />
diff --git a/platform/ui-next/src/components/Icons/Sources/OHIFLogoHorizontal.tsx b/platform/ui-next/src/components/Icons/Sources/OHIFLogoHorizontal.tsx
index e530c86f040..cdf0be62d08 100644
--- a/platform/ui-next/src/components/Icons/Sources/OHIFLogoHorizontal.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/OHIFLogoHorizontal.tsx
@@ -11,127 +11,127 @@ export const OHIFLogoHorizontal = (props: IconProps) => (
   >
     <path
       d="M227.792 11.7344V16H226.702V8.90909H227.755V10.017H227.847C228.013 9.65696 228.266 9.36766 228.604 9.14915C228.943 8.92756 229.38 8.81676 229.915 8.81676C230.395 8.81676 230.816 8.91525 231.176 9.11222C231.536 9.30611 231.816 9.60156 232.016 9.99858C232.216 10.3925 232.316 10.8911 232.316 11.4943V16H231.226V11.5682C231.226 11.0111 231.082 10.5772 230.792 10.2663C230.503 9.95241 230.106 9.79545 229.601 9.79545C229.254 9.79545 228.943 9.87086 228.669 10.0217C228.398 10.1725 228.184 10.3925 228.027 10.6818C227.87 10.9711 227.792 11.322 227.792 11.7344Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M221.826 16.1477C221.186 16.1477 220.624 15.9954 220.141 15.6907C219.661 15.386 219.285 14.9598 219.015 14.4119C218.747 13.8641 218.613 13.224 218.613 12.4915C218.613 11.7528 218.747 11.1081 219.015 10.5572C219.285 10.0063 219.661 9.57848 220.141 9.27379C220.624 8.9691 221.186 8.81676 221.826 8.81676C222.466 8.81676 223.026 8.9691 223.507 9.27379C223.99 9.57848 224.365 10.0063 224.633 10.5572C224.904 11.1081 225.039 11.7528 225.039 12.4915C225.039 13.224 224.904 13.8641 224.633 14.4119C224.365 14.9598 223.99 15.386 223.507 15.6907C223.026 15.9954 222.466 16.1477 221.826 16.1477ZM221.826 15.169C222.312 15.169 222.712 15.0444 223.026 14.7951C223.34 14.5458 223.573 14.218 223.723 13.8118C223.874 13.4055 223.95 12.9654 223.95 12.4915C223.95 12.0175 223.874 11.5759 223.723 11.1665C223.573 10.7572 223.34 10.4264 223.026 10.174C222.712 9.92164 222.312 9.79545 221.826 9.79545C221.34 9.79545 220.94 9.92164 220.626 10.174C220.312 10.4264 220.08 10.7572 219.929 11.1665C219.778 11.5759 219.703 12.0175 219.703 12.4915C219.703 12.9654 219.778 13.4055 219.929 13.8118C220.08 14.218 220.312 14.5458 220.626 14.7951C220.94 15.0444 221.34 15.169 221.826 15.169Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M215.861 16V8.90909H216.95V16H215.861ZM216.414 7.72727C216.202 7.72727 216.019 7.65495 215.865 7.5103C215.714 7.36565 215.639 7.19176 215.639 6.98864C215.639 6.78551 215.714 6.61162 215.865 6.46697C216.019 6.32232 216.202 6.25 216.414 6.25C216.627 6.25 216.808 6.32232 216.959 6.46697C217.113 6.61162 217.19 6.78551 217.19 6.98864C217.19 7.19176 217.113 7.36565 216.959 7.5103C216.808 7.65495 216.627 7.72727 216.414 7.72727Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M214.222 8.90909V9.83239H210.547V8.90909H214.222ZM211.618 7.21023H212.707V13.9688C212.707 14.2765 212.752 14.5073 212.841 14.6612C212.934 14.812 213.051 14.9136 213.192 14.9659C213.337 15.0152 213.489 15.0398 213.649 15.0398C213.769 15.0398 213.868 15.0336 213.945 15.0213C214.022 15.0059 214.083 14.9936 214.129 14.9844L214.351 15.9631C214.277 15.9908 214.174 16.0185 214.042 16.0462C213.909 16.0769 213.741 16.0923 213.538 16.0923C213.231 16.0923 212.929 16.0262 212.634 15.8938C212.341 15.7615 212.098 15.5599 211.904 15.2891C211.713 15.0182 211.618 14.6766 211.618 14.2642V7.21023Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M205.899 16.1662C205.45 16.1662 205.042 16.0816 204.676 15.9123C204.31 15.7399 204.019 15.4922 203.803 15.169C203.588 14.8428 203.48 14.4489 203.48 13.9872C203.48 13.581 203.56 13.2517 203.72 12.9993C203.88 12.7438 204.094 12.5438 204.362 12.3991C204.63 12.2545 204.925 12.1468 205.248 12.076C205.575 12.0021 205.902 11.9437 206.232 11.9006C206.663 11.8452 207.012 11.8036 207.28 11.7759C207.55 11.7451 207.747 11.6944 207.87 11.6236C207.997 11.5528 208.06 11.4297 208.06 11.2543V11.2173C208.06 10.7618 207.935 10.4079 207.686 10.1555C207.44 9.90317 207.066 9.77699 206.564 9.77699C206.044 9.77699 205.636 9.89086 205.341 10.1186C205.045 10.3464 204.837 10.5895 204.717 10.848L203.683 10.4787C203.868 10.0478 204.114 9.71236 204.422 9.4723C204.733 9.22917 205.071 9.0599 205.438 8.96449C205.807 8.866 206.17 8.81676 206.527 8.81676C206.755 8.81676 207.016 8.84446 207.312 8.89986C207.61 8.95218 207.898 9.06143 208.175 9.22763C208.455 9.39382 208.688 9.64465 208.872 9.98011C209.057 10.3156 209.149 10.7649 209.149 11.3281V16H208.06V15.0398H208.004C207.931 15.1937 207.807 15.3583 207.635 15.5337C207.463 15.7092 207.233 15.8584 206.947 15.9815C206.661 16.1046 206.312 16.1662 205.899 16.1662ZM206.065 15.1875C206.496 15.1875 206.859 15.1029 207.155 14.9336C207.453 14.7643 207.678 14.5458 207.829 14.2781C207.983 14.0103 208.06 13.7287 208.06 13.4332V12.4361C208.014 12.4915 207.912 12.5423 207.755 12.5884C207.601 12.6315 207.423 12.67 207.22 12.7038C207.02 12.7346 206.824 12.7623 206.633 12.7869C206.446 12.8085 206.293 12.8269 206.176 12.8423C205.893 12.8793 205.628 12.9393 205.382 13.0224C205.139 13.1024 204.942 13.224 204.791 13.3871C204.644 13.5471 204.57 13.7656 204.57 14.0426C204.57 14.4212 204.71 14.7074 204.99 14.9013C205.273 15.0921 205.631 15.1875 206.065 15.1875Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M198.416 16.1477C197.825 16.1477 197.303 15.9985 196.851 15.6999C196.399 15.3983 196.045 14.9736 195.789 14.4258C195.534 13.8749 195.406 13.224 195.406 12.473C195.406 11.7282 195.534 11.0819 195.789 10.5341C196.045 9.98627 196.4 9.56309 196.856 9.26456C197.311 8.96603 197.837 8.81676 198.434 8.81676C198.896 8.81676 199.261 8.8937 199.529 9.04759C199.799 9.19839 200.006 9.37074 200.147 9.56463C200.292 9.75544 200.404 9.9124 200.484 10.0355H200.576V6.54545H201.666V16H200.613V14.9105H200.484C200.404 15.0398 200.29 15.2029 200.143 15.3999C199.995 15.5937 199.784 15.7676 199.51 15.9215C199.236 16.0723 198.871 16.1477 198.416 16.1477ZM198.564 15.169C199.001 15.169 199.37 15.0552 199.672 14.8274C199.973 14.5966 200.203 14.2781 200.359 13.8718C200.516 13.4625 200.595 12.9901 200.595 12.4545C200.595 11.9252 200.518 11.462 200.364 11.065C200.21 10.6649 199.982 10.354 199.681 10.1325C199.379 9.90779 199.007 9.79545 198.564 9.79545C198.102 9.79545 197.717 9.91394 197.41 10.1509C197.105 10.3848 196.876 10.7034 196.722 11.1065C196.571 11.5066 196.495 11.956 196.495 12.4545C196.495 12.9593 196.572 13.4179 196.726 13.8303C196.883 14.2396 197.114 14.5658 197.419 14.8089C197.727 15.049 198.108 15.169 198.564 15.169Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M189.223 11.7344V16H188.134V8.90909H189.186V10.017H189.279C189.445 9.65696 189.697 9.36766 190.036 9.14915C190.374 8.92756 190.811 8.81676 191.347 8.81676C191.827 8.81676 192.247 8.91525 192.607 9.11222C192.967 9.30611 193.247 9.60156 193.447 9.99858C193.648 10.3925 193.748 10.8911 193.748 11.4943V16H192.658V11.5682C192.658 11.0111 192.513 10.5772 192.224 10.2663C191.935 9.95241 191.538 9.79545 191.033 9.79545C190.685 9.79545 190.374 9.87086 190.101 10.0217C189.83 10.1725 189.616 10.3925 189.459 10.6818C189.302 10.9711 189.223 11.322 189.223 11.7344Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M185.049 13.1009V8.90909H186.138V16H185.049V14.7997H184.975C184.809 15.1598 184.55 15.466 184.2 15.7184C183.849 15.9677 183.405 16.0923 182.87 16.0923C182.427 16.0923 182.033 15.9954 181.688 15.8015C181.343 15.6045 181.073 15.3091 180.876 14.9151C180.679 14.5181 180.58 14.018 180.58 13.4148V8.90909H181.67V13.3409C181.67 13.858 181.814 14.2704 182.104 14.5781C182.396 14.8859 182.768 15.0398 183.221 15.0398C183.492 15.0398 183.767 14.9705 184.047 14.832C184.33 14.6935 184.567 14.4812 184.758 14.195C184.952 13.9087 185.049 13.544 185.049 13.1009Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M175.704 16.1477C175.064 16.1477 174.502 15.9954 174.019 15.6907C173.539 15.386 173.163 14.9598 172.893 14.4119C172.625 13.8641 172.491 13.224 172.491 12.4915C172.491 11.7528 172.625 11.1081 172.893 10.5572C173.163 10.0063 173.539 9.57848 174.019 9.27379C174.502 8.9691 175.064 8.81676 175.704 8.81676C176.344 8.81676 176.904 8.9691 177.384 9.27379C177.868 9.57848 178.243 10.0063 178.511 10.5572C178.782 11.1081 178.917 11.7528 178.917 12.4915C178.917 13.224 178.782 13.8641 178.511 14.4119C178.243 14.9598 177.868 15.386 177.384 15.6907C176.904 15.9954 176.344 16.1477 175.704 16.1477ZM175.704 15.169C176.19 15.169 176.59 15.0444 176.904 14.7951C177.218 14.5458 177.451 14.218 177.601 13.8118C177.752 13.4055 177.828 12.9654 177.828 12.4915C177.828 12.0175 177.752 11.5759 177.601 11.1665C177.451 10.7572 177.218 10.4264 176.904 10.174C176.59 9.92164 176.19 9.79545 175.704 9.79545C175.218 9.79545 174.818 9.92164 174.504 10.174C174.19 10.4264 173.957 10.7572 173.807 11.1665C173.656 11.5759 173.58 12.0175 173.58 12.4915C173.58 12.9654 173.656 13.4055 173.807 13.8118C173.957 14.218 174.19 14.5458 174.504 14.7951C174.818 15.0444 175.218 15.169 175.704 15.169Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M165.862 16V6.54545H171.531V7.56108H167.007V10.7557H171.106V11.7713H167.007V16H165.862Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M156.998 18.8068C156.472 18.8068 156.019 18.7391 155.641 18.6037C155.262 18.4714 154.947 18.2959 154.694 18.0774C154.445 17.862 154.247 17.6312 154.099 17.3849L154.967 16.7756C155.065 16.9048 155.19 17.0526 155.341 17.2188C155.492 17.388 155.698 17.5342 155.959 17.6573C156.224 17.7835 156.57 17.8466 156.998 17.8466C157.571 17.8466 158.043 17.7081 158.415 17.4311C158.788 17.1541 158.974 16.7202 158.974 16.1293V14.6889H158.882C158.802 14.8182 158.688 14.9782 158.54 15.169C158.395 15.3568 158.186 15.5245 157.912 15.6722C157.641 15.8169 157.275 15.8892 156.813 15.8892C156.241 15.8892 155.727 15.7538 155.272 15.483C154.819 15.2121 154.461 14.8182 154.196 14.3011C153.934 13.7841 153.803 13.1562 153.803 12.4176C153.803 11.6913 153.931 11.0588 154.187 10.5202C154.442 9.97857 154.798 9.56001 155.253 9.26456C155.709 8.96603 156.235 8.81676 156.832 8.81676C157.294 8.81676 157.66 8.8937 157.931 9.04759C158.205 9.19839 158.414 9.37074 158.558 9.56463C158.706 9.75544 158.82 9.9124 158.9 10.0355H159.011V8.90909H160.063V16.2031C160.063 16.8125 159.925 17.308 159.648 17.6896C159.374 18.0743 159.005 18.3559 158.54 18.5344C158.078 18.716 157.564 18.8068 156.998 18.8068ZM156.961 14.9105C157.398 14.9105 157.767 14.8105 158.069 14.6104C158.371 14.4104 158.6 14.1226 158.757 13.7472C158.914 13.3717 158.992 12.9223 158.992 12.3991C158.992 11.8883 158.915 11.4374 158.762 11.0465C158.608 10.6557 158.38 10.3494 158.078 10.1278C157.777 9.90625 157.404 9.79545 156.961 9.79545C156.499 9.79545 156.115 9.9124 155.807 10.1463C155.502 10.3802 155.273 10.6941 155.119 11.0881C154.968 11.482 154.893 11.919 154.893 12.3991C154.893 12.8916 154.97 13.3271 155.124 13.7056C155.281 14.0811 155.512 14.3765 155.816 14.592C156.124 14.8043 156.506 14.9105 156.961 14.9105Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M147.621 11.7344V16H146.531V8.90909H147.584V10.017H147.676C147.842 9.65696 148.095 9.36766 148.433 9.14915C148.772 8.92756 149.209 8.81676 149.744 8.81676C150.225 8.81676 150.645 8.91525 151.005 9.11222C151.365 9.30611 151.645 9.60156 151.845 9.99858C152.045 10.3925 152.145 10.8911 152.145 11.4943V16H151.056V11.5682C151.056 11.0111 150.911 10.5772 150.622 10.2663C150.332 9.95241 149.935 9.79545 149.431 9.79545C149.083 9.79545 148.772 9.87086 148.498 10.0217C148.227 10.1725 148.013 10.3925 147.856 10.6818C147.699 10.9711 147.621 11.322 147.621 11.7344Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M143.446 16V8.90909H144.536V16H143.446ZM144 7.72727C143.788 7.72727 143.605 7.65495 143.451 7.5103C143.3 7.36565 143.225 7.19176 143.225 6.98864C143.225 6.78551 143.3 6.61162 143.451 6.46697C143.605 6.32232 143.788 6.25 144 6.25C144.213 6.25 144.394 6.32232 144.545 6.46697C144.699 6.61162 144.776 6.78551 144.776 6.98864C144.776 7.19176 144.699 7.36565 144.545 7.5103C144.394 7.65495 144.213 7.72727 144 7.72727Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M138.387 18.8068C137.86 18.8068 137.408 18.7391 137.029 18.6037C136.651 18.4714 136.335 18.2959 136.083 18.0774C135.834 17.862 135.635 17.6312 135.488 17.3849L136.355 16.7756C136.454 16.9048 136.579 17.0526 136.729 17.2188C136.88 17.388 137.086 17.5342 137.348 17.6573C137.613 17.7835 137.959 17.8466 138.387 17.8466C138.959 17.8466 139.432 17.7081 139.804 17.4311C140.176 17.1541 140.363 16.7202 140.363 16.1293V14.6889H140.27C140.19 14.8182 140.076 14.9782 139.929 15.169C139.784 15.3568 139.575 15.5245 139.301 15.6722C139.03 15.8169 138.664 15.8892 138.202 15.8892C137.63 15.8892 137.116 15.7538 136.66 15.483C136.208 15.2121 135.849 14.8182 135.585 14.3011C135.323 13.7841 135.192 13.1562 135.192 12.4176C135.192 11.6913 135.32 11.0588 135.575 10.5202C135.831 9.97857 136.186 9.56001 136.642 9.26456C137.097 8.96603 137.623 8.81676 138.221 8.81676C138.682 8.81676 139.048 8.8937 139.319 9.04759C139.593 9.19839 139.802 9.37074 139.947 9.56463C140.095 9.75544 140.209 9.9124 140.289 10.0355H140.4V8.90909H141.452V16.2031C141.452 16.8125 141.314 17.308 141.037 17.6896C140.763 18.0743 140.393 18.3559 139.929 18.5344C139.467 18.716 138.953 18.8068 138.387 18.8068ZM138.35 14.9105C138.787 14.9105 139.156 14.8105 139.458 14.6104C139.759 14.4104 139.989 14.1226 140.146 13.7472C140.303 13.3717 140.381 12.9223 140.381 12.3991C140.381 11.8883 140.304 11.4374 140.15 11.0465C139.996 10.6557 139.769 10.3494 139.467 10.1278C139.165 9.90625 138.793 9.79545 138.35 9.79545C137.888 9.79545 137.503 9.9124 137.196 10.1463C136.891 10.3802 136.662 10.6941 136.508 11.0881C136.357 11.482 136.282 11.919 136.282 12.3991C136.282 12.8916 136.359 13.3271 136.512 13.7056C136.669 14.0811 136.9 14.3765 137.205 14.592C137.513 14.8043 137.894 14.9105 138.35 14.9105Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M130.286 16.1662C129.837 16.1662 129.429 16.0816 129.063 15.9123C128.696 15.7399 128.406 15.4922 128.19 15.169C127.975 14.8428 127.867 14.4489 127.867 13.9872C127.867 13.581 127.947 13.2517 128.107 12.9993C128.267 12.7438 128.481 12.5438 128.749 12.3991C129.016 12.2545 129.312 12.1468 129.635 12.076C129.961 12.0021 130.289 11.9437 130.618 11.9006C131.049 11.8452 131.399 11.8036 131.666 11.7759C131.937 11.7451 132.134 11.6944 132.257 11.6236C132.383 11.5528 132.446 11.4297 132.446 11.2543V11.2173C132.446 10.7618 132.322 10.4079 132.073 10.1555C131.826 9.90317 131.452 9.77699 130.951 9.77699C130.431 9.77699 130.023 9.89086 129.727 10.1186C129.432 10.3464 129.224 10.5895 129.104 10.848L128.07 10.4787C128.255 10.0478 128.501 9.71236 128.809 9.4723C129.12 9.22917 129.458 9.0599 129.824 8.96449C130.194 8.866 130.557 8.81676 130.914 8.81676C131.142 8.81676 131.403 8.84446 131.699 8.89986C131.997 8.95218 132.285 9.06143 132.562 9.22763C132.842 9.39382 133.074 9.64465 133.259 9.98011C133.444 10.3156 133.536 10.7649 133.536 11.3281V16H132.446V15.0398H132.391C132.317 15.1937 132.194 15.3583 132.022 15.5337C131.849 15.7092 131.62 15.8584 131.334 15.9815C131.048 16.1046 130.698 16.1662 130.286 16.1662ZM130.452 15.1875C130.883 15.1875 131.246 15.1029 131.542 14.9336C131.84 14.7643 132.065 14.5458 132.216 14.2781C132.37 14.0103 132.446 13.7287 132.446 13.4332V12.4361C132.4 12.4915 132.299 12.5423 132.142 12.5884C131.988 12.6315 131.809 12.67 131.606 12.7038C131.406 12.7346 131.211 12.7623 131.02 12.7869C130.832 12.8085 130.68 12.8269 130.563 12.8423C130.28 12.8793 130.015 12.9393 129.769 13.0224C129.526 13.1024 129.329 13.224 129.178 13.3871C129.03 13.5471 128.956 13.7656 128.956 14.0426C128.956 14.4212 129.096 14.7074 129.377 14.9013C129.66 15.0921 130.018 15.1875 130.452 15.1875Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M116.901 16V8.90909H117.953V10.017H118.045C118.193 9.63849 118.432 9.34458 118.761 9.1353C119.09 8.92294 119.486 8.81676 119.947 8.81676C120.415 8.81676 120.805 8.92294 121.115 9.1353C121.429 9.34458 121.674 9.63849 121.849 10.017H121.923C122.105 9.6508 122.377 9.35997 122.74 9.14453C123.104 8.92602 123.539 8.81676 124.047 8.81676C124.681 8.81676 125.199 9.01527 125.603 9.41229C126.006 9.80623 126.207 10.4202 126.207 11.2543V16H125.118V11.2543C125.118 10.7311 124.975 10.3571 124.689 10.1325C124.402 9.90779 124.065 9.79545 123.677 9.79545C123.179 9.79545 122.793 9.94626 122.519 10.2479C122.245 10.5464 122.108 10.925 122.108 11.3835V16H121V11.1435C121 10.7403 120.869 10.4156 120.608 10.1694C120.346 9.9201 120.009 9.79545 119.597 9.79545C119.313 9.79545 119.049 9.87086 118.802 10.0217C118.559 10.1725 118.362 10.3817 118.212 10.6495C118.064 10.9142 117.99 11.2204 117.99 11.5682V16H116.901Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M114.753 6.54545V16H113.608V6.54545H114.753Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M103.213 11.7344V16H102.123V6.54545H103.213V10.017H103.305C103.471 9.6508 103.72 9.35997 104.053 9.14453C104.388 8.92602 104.835 8.81676 105.392 8.81676C105.875 8.81676 106.298 8.91371 106.661 9.1076C107.024 9.29841 107.306 9.59233 107.506 9.98935C107.709 10.3833 107.811 10.8849 107.811 11.4943V16H106.721V11.5682C106.721 11.005 106.575 10.5695 106.283 10.2617C105.993 9.95088 105.592 9.79545 105.078 9.79545C104.721 9.79545 104.401 9.87086 104.117 10.0217C103.837 10.1725 103.616 10.3925 103.453 10.6818C103.293 10.9711 103.213 11.322 103.213 11.7344Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M100.332 8.90909V9.83239H96.6572V8.90909H100.332ZM97.7282 7.21023H98.8177V13.9688C98.8177 14.2765 98.8624 14.5073 98.9516 14.6612C99.0439 14.812 99.1609 14.9136 99.3025 14.9659C99.4471 15.0152 99.5995 15.0398 99.7595 15.0398C99.8795 15.0398 99.978 15.0336 100.055 15.0213C100.132 15.0059 100.193 14.9936 100.24 14.9844L100.461 15.9631C100.387 15.9908 100.284 16.0185 100.152 16.0462C100.02 16.0769 99.8518 16.0923 99.6487 16.0923C99.3409 16.0923 99.0393 16.0262 98.7439 15.8938C98.4515 15.7615 98.2084 15.5599 98.0145 15.2891C97.8237 15.0182 97.7282 14.6766 97.7282 14.2642V7.21023Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M95.2527 6.54545V16H94.1632V6.54545H95.2527Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M88.9246 16.1662C88.4753 16.1662 88.0675 16.0816 87.7013 15.9123C87.335 15.7399 87.0442 15.4922 86.8288 15.169C86.6133 14.8428 86.5056 14.4489 86.5056 13.9872C86.5056 13.581 86.5856 13.2517 86.7457 12.9993C86.9057 12.7438 87.1196 12.5438 87.3874 12.3991C87.6551 12.2545 87.9506 12.1468 88.2737 12.076C88.6 12.0021 88.9277 11.9437 89.257 11.9006C89.6879 11.8452 90.0372 11.8036 90.305 11.7759C90.5758 11.7451 90.7728 11.6944 90.8959 11.6236C91.0221 11.5528 91.0852 11.4297 91.0852 11.2543V11.2173C91.0852 10.7618 90.9605 10.4079 90.7112 10.1555C90.465 9.90317 90.0911 9.77699 89.5894 9.77699C89.0693 9.77699 88.6615 9.89086 88.3661 10.1186C88.0706 10.3464 87.8629 10.5895 87.7428 10.848L86.7087 10.4787C86.8934 10.0478 87.1396 9.71236 87.4474 9.4723C87.7582 9.22917 88.0968 9.0599 88.463 8.96449C88.8323 8.866 89.1955 8.81676 89.5525 8.81676C89.7802 8.81676 90.0418 8.84446 90.3373 8.89986C90.6358 8.95218 90.9236 9.06143 91.2006 9.22763C91.4806 9.39382 91.713 9.64465 91.8977 9.98011C92.0823 10.3156 92.1747 10.7649 92.1747 11.3281V16H91.0852V15.0398H91.0298C90.9559 15.1937 90.8328 15.3583 90.6604 15.5337C90.4881 15.7092 90.2588 15.8584 89.9726 15.9815C89.6864 16.1046 89.3371 16.1662 88.9246 16.1662ZM89.0908 15.1875C89.5217 15.1875 89.8849 15.1029 90.1803 14.9336C90.4789 14.7643 90.7035 14.5458 90.8543 14.2781C91.0082 14.0103 91.0852 13.7287 91.0852 13.4332V12.4361C91.039 12.4915 90.9374 12.5423 90.7805 12.5884C90.6266 12.6315 90.4481 12.67 90.245 12.7038C90.0449 12.7346 89.8495 12.7623 89.6587 12.7869C89.4709 12.8085 89.3186 12.8269 89.2016 12.8423C88.9185 12.8793 88.6538 12.9393 88.4076 13.0224C88.1645 13.1024 87.9675 13.224 87.8167 13.3871C87.669 13.5471 87.5951 13.7656 87.5951 14.0426C87.5951 14.4212 87.7351 14.7074 88.0152 14.9013C88.2983 15.0921 88.6569 15.1875 89.0908 15.1875Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M82.2446 16.1477C81.5614 16.1477 80.972 15.9969 80.4765 15.6953C79.9841 15.3906 79.604 14.9659 79.3362 14.4212C79.0715 13.8733 78.9392 13.2363 78.9392 12.5099C78.9392 11.7836 79.0715 11.1435 79.3362 10.5895C79.604 10.0324 79.9764 9.59848 80.4534 9.28764C80.9335 8.97372 81.4937 8.81676 82.1338 8.81676C82.5031 8.81676 82.8678 8.87831 83.2279 9.00142C83.588 9.12453 83.9158 9.32457 84.2112 9.60156C84.5067 9.87547 84.7421 10.2386 84.9175 10.6911C85.093 11.1435 85.1807 11.7005 85.1807 12.3622V12.8239H79.7148V11.8821H84.0727C84.0727 11.482 83.9927 11.125 83.8327 10.8111C83.6757 10.4972 83.451 10.2494 83.1587 10.0678C82.8694 9.88624 82.5278 9.79545 82.1338 9.79545C81.6999 9.79545 81.3244 9.90317 81.0074 10.1186C80.6935 10.331 80.4519 10.608 80.2826 10.9496C80.1133 11.2912 80.0287 11.6574 80.0287 12.0483V12.6761C80.0287 13.2116 80.121 13.6656 80.3057 14.038C80.4934 14.4073 80.7535 14.6889 81.0859 14.8828C81.4183 15.0736 81.8045 15.169 82.2446 15.169C82.5308 15.169 82.7894 15.129 83.0202 15.049C83.2541 14.9659 83.4557 14.8428 83.6249 14.6797C83.7942 14.5135 83.925 14.3073 84.0173 14.0611L85.0699 14.3565C84.9591 14.7135 84.7729 15.0275 84.5113 15.2983C84.2497 15.5661 83.9265 15.7753 83.5418 15.9261C83.1571 16.0739 82.7247 16.1477 82.2446 16.1477Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M69.7963 16V6.54545H70.9412V10.7557H75.9823V6.54545H77.1272V16H75.9823V11.7713H70.9412V16H69.7963Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M59.4773 11.7344V16H58.3878V8.90909H59.4404V10.017H59.5327C59.6989 9.65696 59.9513 9.36766 60.2898 9.14915C60.6283 8.92756 61.0654 8.81676 61.6009 8.81676C62.081 8.81676 62.5011 8.91525 62.8612 9.11222C63.2213 9.30611 63.5013 9.60156 63.7014 9.99858C63.9014 10.3925 64.0015 10.8911 64.0015 11.4943V16H62.912V11.5682C62.912 11.0111 62.7673 10.5772 62.478 10.2663C62.1887 9.95241 61.7917 9.79545 61.287 9.79545C60.9392 9.79545 60.6283 9.87086 60.3544 10.0217C60.0836 10.1725 59.8697 10.3925 59.7127 10.6818C59.5558 10.9711 59.4773 11.322 59.4773 11.7344Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M53.7944 16.1477C53.1112 16.1477 52.5218 15.9969 52.0263 15.6953C51.5339 15.3906 51.1538 14.9659 50.886 14.4212C50.6214 13.8733 50.489 13.2363 50.489 12.5099C50.489 11.7836 50.6214 11.1435 50.886 10.5895C51.1538 10.0324 51.5262 9.59848 52.0032 9.28764C52.4833 8.97372 53.0435 8.81676 53.6836 8.81676C54.0529 8.81676 54.4176 8.87831 54.7777 9.00142C55.1378 9.12453 55.4656 9.32457 55.761 9.60156C56.0565 9.87547 56.2919 10.2386 56.4674 10.6911C56.6428 11.1435 56.7305 11.7005 56.7305 12.3622V12.8239H51.2646V11.8821H55.6225C55.6225 11.482 55.5425 11.125 55.3825 10.8111C55.2255 10.4972 55.0009 10.2494 54.7085 10.0678C54.4192 9.88624 54.0776 9.79545 53.6836 9.79545C53.2497 9.79545 52.8742 9.90317 52.5572 10.1186C52.2433 10.331 52.0017 10.608 51.8324 10.9496C51.6631 11.2912 51.5785 11.6574 51.5785 12.0483V12.6761C51.5785 13.2116 51.6708 13.6656 51.8555 14.038C52.0432 14.4073 52.3033 14.6889 52.6357 14.8828C52.9681 15.0736 53.3543 15.169 53.7944 15.169C54.0806 15.169 54.3392 15.129 54.57 15.049C54.8039 14.9659 55.0055 14.8428 55.1747 14.6797C55.344 14.5135 55.4748 14.3073 55.5671 14.0611L56.6197 14.3565C56.5089 14.7135 56.3227 15.0275 56.0611 15.2983C55.7995 15.5661 55.4763 15.7753 55.0916 15.9261C54.7069 16.0739 54.2745 16.1477 53.7944 16.1477Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M42.8995 18.6591V8.90909H43.9521V10.0355H44.0814C44.1614 9.9124 44.2722 9.75544 44.4137 9.56463C44.5584 9.37074 44.7646 9.19839 45.0323 9.04759C45.3032 8.8937 45.6694 8.81676 46.1311 8.81676C46.7281 8.81676 47.2544 8.96603 47.7099 9.26456C48.1654 9.56309 48.5209 9.98627 48.7763 10.5341C49.0318 11.0819 49.1595 11.7282 49.1595 12.473C49.1595 13.224 49.0318 13.8749 48.7763 14.4258C48.5209 14.9736 48.1669 15.3983 47.7145 15.6999C47.2621 15.9985 46.7404 16.1477 46.1495 16.1477C45.694 16.1477 45.3293 16.0723 45.0554 15.9215C44.7815 15.7676 44.5707 15.5937 44.423 15.3999C44.2752 15.2029 44.1614 15.0398 44.0814 14.9105H43.989V18.6591H42.8995ZM43.9706 12.4545C43.9706 12.9901 44.049 13.4625 44.206 13.8718C44.363 14.2781 44.5922 14.5966 44.8939 14.8274C45.1955 15.0552 45.5648 15.169 46.0018 15.169C46.4573 15.169 46.8374 15.049 47.1421 14.8089C47.4498 14.5658 47.6807 14.2396 47.8346 13.8303C47.9915 13.4178 48.07 12.9593 48.07 12.4545C48.07 11.956 47.9931 11.5066 47.8392 11.1065C47.6884 10.7034 47.4591 10.3848 47.1513 10.1509C46.8466 9.91394 46.4635 9.79545 46.0018 9.79545C45.5586 9.79545 45.1862 9.90779 44.8846 10.1325C44.583 10.354 44.3553 10.6649 44.2014 11.065C44.0475 11.462 43.9706 11.9252 43.9706 12.4545Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M41.1221 11.2727C41.1221 12.2699 40.9421 13.1316 40.582 13.858C40.2219 14.5843 39.7279 15.1444 39.1001 15.5384C38.4722 15.9323 37.7552 16.1293 36.9488 16.1293C36.1425 16.1293 35.4254 15.9323 34.7975 15.5384C34.1697 15.1444 33.6757 14.5843 33.3156 13.858C32.9556 13.1316 32.7755 12.2699 32.7755 11.2727C32.7755 10.2756 32.9556 9.41383 33.3156 8.6875C33.6757 7.96117 34.1697 7.40104 34.7975 7.0071C35.4254 6.61316 36.1425 6.41619 36.9488 6.41619C37.7552 6.41619 38.4722 6.61316 39.1001 7.0071C39.7279 7.40104 40.2219 7.96117 40.582 8.6875C40.9421 9.41383 41.1221 10.2756 41.1221 11.2727ZM40.0141 11.2727C40.0141 10.4541 39.8772 9.76314 39.6033 9.19993C39.3324 8.63672 38.9647 8.21046 38.4999 7.92116C38.0383 7.63187 37.5213 7.48722 36.9488 7.48722C36.3764 7.48722 35.8578 7.63187 35.3931 7.92116C34.9314 8.21046 34.5636 8.63672 34.2897 9.19993C34.0189 9.76314 33.8835 10.4541 33.8835 11.2727C33.8835 12.0914 34.0189 12.7823 34.2897 13.3455C34.5636 13.9087 34.9314 14.335 35.3931 14.6243C35.8578 14.9136 36.3764 15.0582 36.9488 15.0582C37.5213 15.0582 38.0383 14.9136 38.4999 14.6243C38.9647 14.335 39.3324 13.9087 39.6033 13.3455C39.8772 12.7823 40.0141 12.0914 40.0141 11.2727Z"
-      fill="white"
+      fill="hsl(var(--foreground))"
     />
     <path
       d="M21.5 3C21.5 2.17157 20.8284 1.5 20 1.5H15C14.1716 1.5 13.5 2.17157 13.5 3V8C13.5 8.82843 14.1716 9.5 15 9.5H20C20.8284 9.5 21.5 8.82843 21.5 8V3ZM22.5 8C22.5 9.38071 21.3807 10.5 20 10.5H15C13.6193 10.5 12.5 9.38071 12.5 8V3C12.5 1.61929 13.6193 0.5 15 0.5H20C21.3807 0.5 22.5 1.61929 22.5 3V8Z"
-      fill="#358CFD"
+      fill="hsl(var(--primary))"
     />
     <path
       d="M9.5 3C9.5 2.17157 8.82843 1.5 8 1.5H3C2.17157 1.5 1.5 2.17157 1.5 3V8C1.5 8.82843 2.17157 9.5 3 9.5H8C8.82843 9.5 9.5 8.82843 9.5 8V3ZM10.5 8C10.5 9.38071 9.38071 10.5 8 10.5H3C1.61929 10.5 0.5 9.38071 0.5 8V3C0.5 1.61929 1.61929 0.5 3 0.5H8C9.38071 0.5 10.5 1.61929 10.5 3V8Z"
-      fill="#358CFD"
+      fill="hsl(var(--primary))"
     />
     <path
       d="M9.5 15C9.5 14.1716 8.82843 13.5 8 13.5H3C2.17157 13.5 1.5 14.1716 1.5 15V20C1.5 20.8284 2.17157 21.5 3 21.5H8C8.82843 21.5 9.5 20.8284 9.5 20V15ZM10.5 20C10.5 21.3807 9.38071 22.5 8 22.5H3C1.61929 22.5 0.5 21.3807 0.5 20V15C0.5 13.6193 1.61929 12.5 3 12.5H8C9.38071 12.5 10.5 13.6193 10.5 15V20Z"
-      fill="#358CFD"
+      fill="hsl(var(--primary))"
     />
     <path
       d="M21.5 15C21.5 14.1716 20.8284 13.5 20 13.5H15C14.1716 13.5 13.5 14.1716 13.5 15V20C13.5 20.8284 14.1716 21.5 15 21.5H20C20.8284 21.5 21.5 20.8284 21.5 20V15ZM22.5 20C22.5 21.3807 21.3807 22.5 20 22.5H15C13.6193 22.5 12.5 21.3807 12.5 20V15C12.5 13.6193 13.6193 12.5 15 12.5H20C21.3807 12.5 22.5 13.6193 22.5 15V20Z"
-      fill="#358CFD"
+      fill="hsl(var(--primary))"
     />
   </svg>
 );
diff --git a/platform/ui-next/src/components/Icons/Sources/PanelRight.tsx b/platform/ui-next/src/components/Icons/Sources/PanelRight.tsx
index ba154aba070..a1d2ad5fdcd 100644
--- a/platform/ui-next/src/components/Icons/Sources/PanelRight.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/PanelRight.tsx
@@ -17,11 +17,11 @@ export const PanelRight = (props: IconProps) => (
       height="15"
       rx="1.5"
       transform="matrix(-1 0 0 1 18 0)"
-      stroke="#348CFD"
+      stroke="currentColor"
     />
     <path
       d="M17 0.5H13.5V15.5H17C17.8284 15.5 18.5 14.8284 18.5 14V2C18.5 1.17157 17.8284 0.5 17 0.5Z"
-      stroke="#348CFD"
+      stroke="currentColor"
     />
   </svg>
 );
diff --git a/platform/ui-next/src/components/Icons/Sources/Plus.tsx b/platform/ui-next/src/components/Icons/Sources/Plus.tsx
index 60f2cd7b8e3..928c5df78d3 100644
--- a/platform/ui-next/src/components/Icons/Sources/Plus.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/Plus.tsx
@@ -15,7 +15,7 @@ export const Plus = (props: IconProps) => (
     >
       <path d="M0 0h21v21H0z" />
       <g
-        stroke="#348CFD"
+        stroke="currentColor"
         strokeLinecap="round"
         strokeLinejoin="round"
         strokeWidth="1.25"
diff --git a/platform/ui-next/src/components/Icons/Sources/Search.tsx b/platform/ui-next/src/components/Icons/Sources/Search.tsx
index f606aecd465..c82a897272a 100644
--- a/platform/ui-next/src/components/Icons/Sources/Search.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/Search.tsx
@@ -16,7 +16,7 @@ export const Search = (props: IconProps) => (
       <path d="M0 0h18v18H0z" />
       <g
         transform="translate(1 1)"
-        stroke="#348CFD"
+        stroke="currentColor"
         strokeLinecap="round"
         strokeLinejoin="round"
         strokeWidth="1.5"
diff --git a/platform/ui-next/src/components/Icons/Sources/SettingsStudyList.tsx b/platform/ui-next/src/components/Icons/Sources/SettingsStudyList.tsx
index 19bbf2a0ded..fe514073b63 100644
--- a/platform/ui-next/src/components/Icons/Sources/SettingsStudyList.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/SettingsStudyList.tsx
@@ -12,13 +12,13 @@ export const SettingsStudyList = (props: IconProps) => (
   >
     <path
       d="M14.0113 5.16848C13.9329 5.33325 13.8899 5.51264 13.8853 5.69504C13.8806 5.87745 13.9142 6.0588 13.9841 6.22738C14.0539 6.39595 14.1583 6.54799 14.2906 6.67365C14.4229 6.79931 14.5801 6.8958 14.7521 6.95687L15.632 7.26989C15.8859 7.36002 16.1057 7.52657 16.2611 7.74666C16.4166 7.96676 16.5 8.22958 16.5 8.49902C16.5 8.76846 16.4166 9.03129 16.2611 9.25138C16.1057 9.47147 15.8859 9.63803 15.632 9.72815L14.7521 10.0412C14.5801 10.1022 14.4229 10.1987 14.2906 10.3244C14.1583 10.4501 14.0539 10.6021 13.9841 10.7707C13.9142 10.9392 13.8806 11.1206 13.8853 11.303C13.8899 11.4854 13.9329 11.6648 14.0113 11.8296L14.4133 12.6719C14.5295 12.9153 14.5675 13.1887 14.5219 13.4546C14.4763 13.7204 14.3494 13.9656 14.1586 14.1563C13.9679 14.347 13.7228 14.4739 13.4569 14.5195C13.1911 14.5651 12.9177 14.5272 12.6743 14.4109L11.8305 14.0103C11.6658 13.9319 11.4864 13.889 11.304 13.8843C11.1216 13.8796 10.9402 13.9133 10.7716 13.9831C10.6031 14.0529 10.451 14.1574 10.3254 14.2897C10.1997 14.4219 10.1032 14.5792 10.0421 14.7511L9.72913 15.631C9.63886 15.8847 9.47229 16.1042 9.25228 16.2595C9.03227 16.4147 8.76961 16.498 8.50035 16.498C8.23109 16.498 7.96842 16.4147 7.74841 16.2595C7.52841 16.1042 7.36183 15.8847 7.27157 15.631L6.95855 14.7511C6.8974 14.5791 6.80083 14.4219 6.67511 14.2896C6.54938 14.1573 6.39728 14.0529 6.22865 13.983C6.06002 13.9132 5.87862 13.8796 5.69617 13.8843C5.51371 13.8889 5.33428 13.9319 5.16946 14.0103L4.32709 14.4109C4.08371 14.5276 3.81011 14.5659 3.54406 14.5205C3.27801 14.475 3.03262 14.3481 2.84177 14.1573C2.65091 13.9664 2.52401 13.721 2.47857 13.455C2.43313 13.1889 2.47139 12.9153 2.58808 12.6719L2.98875 11.8282C3.06714 11.6634 3.11006 11.484 3.11475 11.3016C3.11943 11.1192 3.08577 10.9379 3.01594 10.7693C2.94611 10.6007 2.84167 10.4487 2.70937 10.323C2.57708 10.1973 2.41987 10.1009 2.24793 10.0398L1.368 9.72676C1.11408 9.63663 0.8943 9.47008 0.738874 9.24999C0.583448 9.0299 0.5 8.76707 0.5 8.49763C0.5 8.22819 0.583448 7.96536 0.738874 7.74527C0.8943 7.52518 1.11408 7.35863 1.368 7.2685L2.24793 6.95548C2.41969 6.89438 2.57673 6.79794 2.70889 6.67238C2.84106 6.54681 2.94542 6.39492 3.01524 6.22652C3.08505 6.05811 3.11876 5.87694 3.1142 5.69469C3.10964 5.51244 3.0669 5.33318 2.98875 5.16848L2.58808 4.32472C2.47139 4.08134 2.43313 3.80774 2.47857 3.54169C2.52401 3.27564 2.65091 3.03025 2.84177 2.8394C3.03262 2.64854 3.27801 2.52164 3.54406 2.4762C3.81011 2.43076 4.08371 2.46902 4.32709 2.58571L5.17085 2.98638C5.33551 3.06457 5.51474 3.10737 5.69696 3.11203C5.87919 3.11669 6.06037 3.0831 6.22881 3.01343C6.39725 2.94376 6.54922 2.83955 6.67491 2.70754C6.80061 2.57552 6.89723 2.41861 6.95855 2.24695L7.27157 1.36702C7.36183 1.11334 7.52841 0.893811 7.74841 0.738574C7.96842 0.583338 8.23109 0.5 8.50035 0.5C8.76961 0.5 9.03227 0.583338 9.25228 0.738574C9.47229 0.893811 9.63886 1.11334 9.72913 1.36702L10.0421 2.24695C10.1032 2.41889 10.1997 2.5761 10.3254 2.70839C10.451 2.84069 10.6031 2.94513 10.7716 3.01496C10.9402 3.08479 11.1216 3.11845 11.304 3.11377C11.4864 3.10908 11.6658 3.06616 11.8305 2.98777L12.6743 2.58571C12.9177 2.46948 13.1911 2.43155 13.4569 2.47716C13.7228 2.52277 13.9679 2.64967 14.1586 2.84038C14.3494 3.0311 14.4763 3.27625 14.5219 3.54208C14.5675 3.80791 14.5295 4.08134 14.4133 4.32472L14.0113 5.16848Z"
-      stroke="#358CFD"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
     <path
       d="M8.49691 11.6292C10.2257 11.6292 11.6271 10.2277 11.6271 8.49898C11.6271 6.77022 10.2257 5.36877 8.49691 5.36877C6.76814 5.36877 5.3667 6.77022 5.3667 8.49898C5.3667 10.2277 6.76814 11.6292 8.49691 11.6292Z"
-      stroke="#358CFD"
+      stroke="currentColor"
       strokeLinecap="round"
       strokeLinejoin="round"
     />
diff --git a/platform/ui-next/src/components/Icons/Sources/Show.tsx b/platform/ui-next/src/components/Icons/Sources/Show.tsx
index e0686dedecf..f18cd3d8551 100644
--- a/platform/ui-next/src/components/Icons/Sources/Show.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/Show.tsx
@@ -25,28 +25,28 @@ export const Show = (props: IconProps) => (
       <path
         d="M18.0567826,8.96286957 C19.1471229,9.75269568 20.1356859,10.674229 21,11.7065217 C21,11.7065217 17.1949565,16.5108696 12.5,16.5108696 C11.7479876,16.5066962 11.0007435,16.3911225 10.2826087,16.167913"
         id="Path"
-        stroke="#348CFD"
+        stroke="currentColor"
         strokeLinecap="round"
         strokeLinejoin="round"
       ></path>
       <path
         d="M6.93286957,14.4413043 C5.84666081,13.6535964 4.86162018,12.7350857 4,11.7065217 C4,11.7065217 7.80504348,6.90217391 12.5,6.90217391 C13.1235541,6.90480509 13.7443251,6.98550531 14.3478261,7.1423913"
         id="Path"
-        stroke="#348CFD"
+        stroke="currentColor"
         strokeLinecap="round"
         strokeLinejoin="round"
       ></path>
       <path
         d="M9.54347826,11.7065217 C9.54347826,10.0736799 10.8671581,8.75 12.5,8.75"
         id="Path"
-        stroke="#348CFD"
+        stroke="currentColor"
         strokeLinecap="round"
         strokeLinejoin="round"
       ></path>
       <path
         d="M15.4565217,11.7065217 C15.4565217,13.3393636 14.1328419,14.6630435 12.5,14.6630435"
         id="Path"
-        stroke="#348CFD"
+        stroke="currentColor"
         strokeLinecap="round"
         strokeLinejoin="round"
       ></path>
@@ -56,7 +56,7 @@ export const Show = (props: IconProps) => (
         x2="5.29347826"
         y2="18.9130435"
         id="Path"
-        stroke="#348CFD"
+        stroke="currentColor"
         strokeLinecap="round"
         strokeLinejoin="round"
       ></line>
diff --git a/platform/ui-next/src/components/Icons/Sources/SocialGithub.tsx b/platform/ui-next/src/components/Icons/Sources/SocialGithub.tsx
index 58d52e64570..ec59acd6374 100644
--- a/platform/ui-next/src/components/Icons/Sources/SocialGithub.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/SocialGithub.tsx
@@ -25,7 +25,7 @@ export const SocialGithub = (props: IconProps) => (
       <g
         id="github-mark"
         transform="translate(1, 1)"
-        fill="#FFFFFF"
+        fill="currentColor"
       >
         <path
           d="M11.009102,0 C4.92135296,0 0,5.04164559 0,11.2788487 C0,16.2645778 3.15328046,20.4848935 7.52771627,21.9785956 C8.07463342,22.0908868 8.2749669,21.7359091 8.2749669,21.4373062 C8.2749669,21.1758281 8.25693914,20.279561 8.25693914,19.3457108 C5.19447352,20.018083 4.55674153,18.0011956 4.55674153,18.0011956 C4.0645837,16.6940344 3.33536083,16.3580774 3.33536083,16.3580774 C2.33301741,15.6671428 3.40837326,15.6671428 3.40837326,15.6671428 C4.52023532,15.7418508 5.10365868,16.824888 5.10365868,16.824888 C6.08774899,18.5427141 7.67351578,18.0573412 8.31147311,17.7585091 C8.4025133,17.0302205 8.69433765,16.5260559 9.00418977,16.2460154 C6.56165372,15.9845373 3.99179662,15.0135622 3.99179662,10.6811845 C3.99179662,9.44873132 4.42896978,8.44040221 5.12168644,7.65619715 C5.01239315,7.37615666 4.62952861,6.21818233 5.23120508,4.66833465 C5.23120508,4.66833465 6.16076142,4.36950256 8.25671379,5.8260798 C9.15406554,5.57919102 10.0794899,5.45359714 11.009102,5.4525397 C11.9386583,5.4525397 12.8862424,5.58339332 13.7612648,5.8260798 C15.8574425,4.36950256 16.7869988,4.66833465 16.7869988,4.66833465 C17.3886753,6.21818233 17.0055854,7.37615666 16.8962921,7.65619715 C17.6072619,8.44040221 18.0264073,9.44873132 18.0264073,10.6811845 C18.0264073,15.0135622 15.4565502,15.9657457 12.995761,16.2460154 C13.3968787,16.6007639 13.7430117,17.2729069 13.7430117,18.3373817 C13.7430117,19.8498753 13.7249839,21.0637661 13.7249839,21.437077 C13.7249839,21.7359091 13.9255427,22.0908868 14.4722345,21.9788248 C18.8466703,20.4846643 22,16.2645778 22,11.2788487 C22.0179786,5.04164559 17.0785978,0 11.009102,0 Z"
diff --git a/platform/ui-next/src/components/Icons/Sources/StatusAlert.tsx b/platform/ui-next/src/components/Icons/Sources/StatusAlert.tsx
index afc3c9c1928..1a33abb1842 100644
--- a/platform/ui-next/src/components/Icons/Sources/StatusAlert.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/StatusAlert.tsx
@@ -15,8 +15,8 @@ export const StatusError = (props: IconProps) => (
     >
       <path d="M0 0h16v16H0z" />
       <rect
-        stroke="#7BB2CE"
-        fill="#0D0E24"
+        stroke="currentColor"
+        fill="transparent"
         x=".5"
         y=".5"
         width="15"
diff --git a/platform/ui-next/src/components/Icons/Sources/StatusLocked.tsx b/platform/ui-next/src/components/Icons/Sources/StatusLocked.tsx
index b4483728a75..b49a969feb6 100644
--- a/platform/ui-next/src/components/Icons/Sources/StatusLocked.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/StatusLocked.tsx
@@ -19,8 +19,8 @@ export const StatusLocked = (props: IconProps) => (
         width="15"
         height="15"
         rx="7.5"
-        fill="#0D0E24"
-        stroke="#7BB2CE"
+        fill="transparent"
+        stroke="currentColor"
       />
       <path
         d="M5.84 12h4.365c.605 0 1.09-.506 1.09-1.125V7.5c0-.619-.485-1.125-1.09-1.125V5.25c0-1.243-.977-2.25-2.182-2.25C6.817 3 5.84 4.007 5.84 5.25v1.125c-.606 0-1.091.506-1.091 1.125v3.375c0 .619.485 1.125 1.09 1.125zm.874-6.75c0-.748.583-1.35 1.309-1.35.725 0 1.309.608 1.309 1.35v1.125H6.714V5.25z"
diff --git a/platform/ui-next/src/components/Icons/Sources/StatusTracking.tsx b/platform/ui-next/src/components/Icons/Sources/StatusTracking.tsx
index 5626e1b2fd3..e69da898aee 100644
--- a/platform/ui-next/src/components/Icons/Sources/StatusTracking.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/StatusTracking.tsx
@@ -15,8 +15,8 @@ export const StatusTracking = (props: IconProps) => (
     >
       <path d="M0 0h16v16H0z" />
       <rect
-        stroke="#5ACCE6"
-        fill="#5ACCE6"
+        stroke="currentColor"
+        fill="currentColor"
         x=".5"
         y=".5"
         width="15"
diff --git a/platform/ui-next/src/components/Icons/Sources/StatusUntracked.tsx b/platform/ui-next/src/components/Icons/Sources/StatusUntracked.tsx
index 0afe693d2c0..35a658d51eb 100644
--- a/platform/ui-next/src/components/Icons/Sources/StatusUntracked.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/StatusUntracked.tsx
@@ -16,7 +16,7 @@ export const StatusUntracked = (props: IconProps) => (
       <path d="M0 0h24v24H0z" />
       <rect
         stroke="currentColor"
-        fill="#0D0E24"
+        fill="transparent"
         x=".5"
         y=".5"
         width="23"
diff --git a/platform/ui-next/src/components/Icons/Sources/Tools.tsx b/platform/ui-next/src/components/Icons/Sources/Tools.tsx
index a4257679385..c3772d588ef 100644
--- a/platform/ui-next/src/components/Icons/Sources/Tools.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/Tools.tsx
@@ -76,7 +76,7 @@ export const ToolLayout = (props: IconProps) => (
         <g
           id="gear"
           transform="translate(21.0876, 17.2796) rotate(-20) translate(-21.0876, -17.2796)translate(15.9634, 11.5127)"
-          stroke="#348CFD"
+          stroke="hsl(var(--primary))"
           strokeLinejoin="round"
           strokeWidth="1.25"
         >
@@ -1825,7 +1825,7 @@ export const ToolLayoutDefault = (props: IconProps) => (
         <g
           id="gear"
           transform="translate(21.0876, 17.2796) rotate(-20) translate(-21.0876, -17.2796)translate(15.9634, 11.5127)"
-          stroke="#348CFD"
+          stroke="hsl(var(--primary))"
           strokeLinejoin="round"
           strokeWidth="1.25"
         >
diff --git a/platform/ui-next/src/components/Icons/Sources/Upload.tsx b/platform/ui-next/src/components/Icons/Sources/Upload.tsx
index 52732b66cc7..3a6f86f540d 100644
--- a/platform/ui-next/src/components/Icons/Sources/Upload.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/Upload.tsx
@@ -10,7 +10,7 @@ export const Upload = (props: IconProps) => (
   >
     <g
       transform="translate(1 1)"
-      stroke="#348CFD"
+      stroke="currentColor"
       fill="none"
       fillRule="evenodd"
       strokeLinecap="round"
diff --git a/platform/ui-next/src/components/LayoutSelector/LayoutSelector.tsx b/platform/ui-next/src/components/LayoutSelector/LayoutSelector.tsx
index 885c406e7b7..1a95686badc 100644
--- a/platform/ui-next/src/components/LayoutSelector/LayoutSelector.tsx
+++ b/platform/ui-next/src/components/LayoutSelector/LayoutSelector.tsx
@@ -320,7 +320,7 @@ const GridSelector = ({ rows = 3, columns = 4, className }: GridSelectorProps) =
       {Array.from(Array(rows * columns).keys()).map(index => (
         <div
           key={index}
-          className={cn('cursor-pointer', isHovered(index) ? 'bg-primary' : 'bg-[#04225b]')}
+          className={cn('cursor-pointer', isHovered(index) ? 'bg-primary' : 'bg-accent')}
           data-cy={`Layout-${index % columns}-${Math.floor(index / columns)}`}
           onClick={() => handleSelection(index)}
           onMouseEnter={() => setHoveredIndex(index)}
diff --git a/platform/ui-next/src/components/Onboarding/Onboarding.css b/platform/ui-next/src/components/Onboarding/Onboarding.css
index 77dbaf238de..3cf51989ffd 100644
--- a/platform/ui-next/src/components/Onboarding/Onboarding.css
+++ b/platform/ui-next/src/components/Onboarding/Onboarding.css
@@ -23,11 +23,11 @@
 }
 
 .shepherd-button {
-  @apply !text-foreground !inline-flex !h-[36px] !min-w-[62px] !flex-row !items-center !justify-center !gap-[5px] !whitespace-nowrap !rounded !bg-[#348cfd] !px-[10px] !text-center !font-sans !text-[14px] !leading-[1.2] !outline-none !transition !duration-300 !ease-in-out focus:!outline-none;
+  @apply !text-foreground !inline-flex !h-[36px] !min-w-[62px] !flex-row !items-center !justify-center !gap-[5px] !whitespace-nowrap !rounded !bg-primary !px-[10px] !text-center !font-sans !text-[14px] !leading-[1.2] !outline-none !transition !duration-300 !ease-in-out focus:!outline-none;
 }
 
 .shepherd-button.shepherd-button-secondary {
-  @apply !bg-transparent !text-[#348cfd];
+  @apply !bg-transparent !text-primary;
 }
 
 .shepherd-arrow::before {
diff --git a/platform/ui-next/src/components/ProgressLoadingBar/ProgressLoadingBar.css b/platform/ui-next/src/components/ProgressLoadingBar/ProgressLoadingBar.css
index f9addbe9e91..24051571be4 100644
--- a/platform/ui-next/src/components/ProgressLoadingBar/ProgressLoadingBar.css
+++ b/platform/ui-next/src/components/ProgressLoadingBar/ProgressLoadingBar.css
@@ -1,5 +1,5 @@
 .loading {
-  background-color: #091731;
+  background-color: hsl(var(--muted));
   height: 8px;
   border-radius: 4px;
   overflow: hidden;
diff --git a/platform/ui-next/src/components/Sonner/Sonner.tsx b/platform/ui-next/src/components/Sonner/Sonner.tsx
index 368e8edea03..af380d555f2 100644
--- a/platform/ui-next/src/components/Sonner/Sonner.tsx
+++ b/platform/ui-next/src/components/Sonner/Sonner.tsx
@@ -8,12 +8,12 @@ const Toaster = ({ ...props }: ToasterProps) => {
   return (
     <Sonner
       className="toaster group"
-      loadingIcon={<Icons.LoadingSpinner />}
+      loadingIcon={<Icons.LoadingSpinner className="text-highlight" />}
       icons={{
         warning: <Icons.StatusWarning />,
         info: <Icons.Info className="text-secondary-foreground" />,
         success: <Icons.StatusSuccess />,
-        error: <Icons.StatusError />,
+        error: <Icons.StatusError className="text-destructive" />,
       }}
       theme="dark"
       richColors="true"
diff --git a/platform/ui-next/src/components/StudyList/components/PreviewToggleButton.tsx b/platform/ui-next/src/components/StudyList/components/PreviewToggleButton.tsx
index 709688f3475..64bcf76a72f 100644
--- a/platform/ui-next/src/components/StudyList/components/PreviewToggleButton.tsx
+++ b/platform/ui-next/src/components/StudyList/components/PreviewToggleButton.tsx
@@ -30,7 +30,7 @@ function PreviewToggleButton({
     >
       <Icons.PanelRight
         aria-hidden="true"
-        className="h-4 w-4"
+        className="text-primary h-4 w-4"
       />
     </Button>
   );