diff --git a/extensions/default/src/Panels/DataSourceSelector.tsx b/extensions/default/src/Panels/DataSourceSelector.tsx
index 15019d52f..b6df12211 100644
--- a/extensions/default/src/Panels/DataSourceSelector.tsx
+++ b/extensions/default/src/Panels/DataSourceSelector.tsx
@@ -3,7 +3,7 @@ import classnames from 'classnames';
 import { useNavigate } from 'react-router-dom';
 import { useAppConfig } from '@state';
 
-import { Button, ButtonEnums } from '@ohif/ui';
+import { Button } from '@ohif/ui-next';
 
 function DataSourceSelector() {
   const [appConfig] = useAppConfig();
@@ -31,8 +31,8 @@ function DataSourceSelector() {
                     {ds.configuration?.friendlyName || ds.friendlyName}
                   </h1>
                   <Button
-                    type={ButtonEnums.type.primary}
-                    className={classnames('ml-2')}
+                    variant="secondary"
+                    className={classnames('ml-2', 'mt-1')}
                     onClick={() => {
                       navigate({
                         pathname: '/',
diff --git a/extensions/default/src/ViewerLayout/ToolbarButtonNestedMenu.tsx b/extensions/default/src/ViewerLayout/ToolbarButtonNestedMenu.tsx
deleted file mode 100644
index 40ef8195d..000000000
--- a/extensions/default/src/ViewerLayout/ToolbarButtonNestedMenu.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import PropTypes from 'prop-types';
-import { ToolbarButton } from '@ohif/ui';
-
-function NestedMenu({ children, label = 'More', icon = 'tool-more-menu', isActive }) {
-  const [isOpen, setIsOpen] = useState(false);
-
-  const toggleNestedMenu = () => setIsOpen(!isOpen);
-
-  const closeNestedMenu = () => {
-    if (isOpen) {
-      setIsOpen(false);
-    }
-  };
-
-  useEffect(() => {
-    window.addEventListener('click', closeNestedMenu);
-    return () => {
-      window.removeEventListener('click', closeNestedMenu);
-    };
-  }, [isOpen]);
-
-  return (
-    <ToolbarButton
-      id="NestedMenu"
-      label={label}
-      icon={icon}
-      onClick={toggleNestedMenu}
-      dropdownContent={isOpen && children}
-      isActive={isActive || isOpen}
-      type="primary"
-    />
-  );
-}
-
-NestedMenu.propTypes = {
-  children: PropTypes.any.isRequired,
-  icon: PropTypes.string,
-  label: PropTypes.string,
-};
-
-export default NestedMenu;