diff --git a/platform/ui-next/src/components/DateRange/DateRange.tsx b/platform/ui-next/src/components/DateRange/DateRange.tsx
index 5c2fdecf116..9e2e398109b 100644
--- a/platform/ui-next/src/components/DateRange/DateRange.tsx
+++ b/platform/ui-next/src/components/DateRange/DateRange.tsx
@@ -2,8 +2,8 @@ import * as React from 'react';
 import { format, parse, isValid } from 'date-fns';
 import { Calendar as CalendarIcon } from 'lucide-react';
 import { cn } from '../../lib/utils';
-import Calendar from '../Calendar';
-import Popover from '../Popover';
+import { Calendar } from '../Calendar';
+import * as Popover from '../Popover';
 
 export type DatePickerWithRangeProps = {
   id: string;
@@ -90,7 +90,7 @@ export function DatePickerWithRange({
               value={start}
               onChange={e => handleInputChange(e, 'start')}
               className={cn(
-                'border-inputfield-main focus:border-inputfield-focus  h-[32px] w-full justify-start rounded border bg-black py-[6.5px] pl-[6.5px] pr-[6.5px] text-left text-sm font-normal hover:bg-black hover:text-white',
+                'border-inputfield-main focus:border-inputfield-focus h-[32px] w-full justify-start rounded border bg-black py-[6.5px] pl-[6.5px] pr-[6.5px] text-left text-sm font-normal hover:bg-black hover:text-white',
                 !start && 'text-muted-foreground'
               )}
               data-cy="input-date-range-start"
diff --git a/platform/ui-next/src/components/SidePanel/SidePanel.tsx b/platform/ui-next/src/components/SidePanel/SidePanel.tsx
index c1b79eaafef..9b8faa3202f 100644
--- a/platform/ui-next/src/components/SidePanel/SidePanel.tsx
+++ b/platform/ui-next/src/components/SidePanel/SidePanel.tsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import React, { useCallback, useEffect, useState } from 'react';
 import { Icons } from '../Icons';
 import { TooltipTrigger, TooltipContent, TooltipProvider, Tooltip } from '../Tooltip';
-import Separator from '../Separator';
+import { Separator } from '../Separator';
 
 type StyleMap = {
   open: {
diff --git a/platform/ui-next/src/components/StudyBrowser/StudyBrowser.tsx b/platform/ui-next/src/components/StudyBrowser/StudyBrowser.tsx
index a5a22585480..5f686ab449f 100644
--- a/platform/ui-next/src/components/StudyBrowser/StudyBrowser.tsx
+++ b/platform/ui-next/src/components/StudyBrowser/StudyBrowser.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import StudyItem from '../StudyItem';
-import StudyBrowserSort from '../StudyBrowserSort';
-import StudyBrowserViewOptions from '../StudyBrowserViewOptions';
+import { StudyItem } from '../StudyItem';
+import { StudyBrowserSort } from '../StudyBrowserSort';
+import { StudyBrowserViewOptions } from '../StudyBrowserViewOptions';
 
 const getTrackedSeries = displaySets => {
   let trackedSeries = 0;
diff --git a/platform/ui-next/src/components/StudyItem/StudyItem.tsx b/platform/ui-next/src/components/StudyItem/StudyItem.tsx
index 2cdb69d206a..3b2271bd845 100644
--- a/platform/ui-next/src/components/StudyItem/StudyItem.tsx
+++ b/platform/ui-next/src/components/StudyItem/StudyItem.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import ThumbnailList from '../ThumbnailList';
+import { ThumbnailList } from '../ThumbnailList';
 
 import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from '../Accordion';
 
diff --git a/platform/ui-next/src/components/Toolbox/Toolbox.tsx b/platform/ui-next/src/components/Toolbox/Toolbox.tsx
index 726de8a41d2..9b60c366c0f 100644
--- a/platform/ui-next/src/components/Toolbox/Toolbox.tsx
+++ b/platform/ui-next/src/components/Toolbox/Toolbox.tsx
@@ -3,7 +3,7 @@ import { useToolbar } from '@ohif/core';
 import { ToolboxUI } from './';
 // Migrate this file to the new UI eventually
 import { useToolbox } from '@ohif/ui';
-import Separator from '../Separator';
+import { Separator } from '../Separator';
 
 /**
  * A toolbox is a collection of buttons and commands that they invoke, used to provide
diff --git a/platform/ui/src/components/StudyBrowser/StudyBrowser.tsx b/platform/ui/src/components/StudyBrowser/StudyBrowser.tsx
index 842f9dac739..93bc0b137c7 100644
--- a/platform/ui/src/components/StudyBrowser/StudyBrowser.tsx
+++ b/platform/ui/src/components/StudyBrowser/StudyBrowser.tsx
@@ -23,7 +23,7 @@ const getTrackedSeries = displaySets => {
   return trackedSeries;
 };
 
-const noop = () => { };
+const noop = () => {};
 
 const StudyBrowser = ({
   tabs,