diff --git a/extensions/default/src/ViewerLayout/SecondaryToolbar.jsx b/extensions/default/src/ViewerLayout/SecondaryToolbar.jsx
deleted file mode 100644
index 26e0b5cfa..000000000
--- a/extensions/default/src/ViewerLayout/SecondaryToolbar.jsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-//
-import { Toolbar } from '@ohif/ui';
-
-function SecondaryToolbar({ tools }) {
-  // const tools = [
-  //   {
-  //     id: 'Annotate',
-  //     label: 'Annotate',
-  //     icon: 'tool-annotate',
-  //     type: null,
-  //     commandName: 'setToolActive',
-  //     commandOptions: { toolName: 'Annotate' },
-  //     onClick: () => console.log('Activate Annotate'),
-  //   },
-  //   {
-  //     id: 'Bidirectional',
-  //     label: 'Bidirectional',
-  //     icon: 'tool-bidirectional',
-  //     type: null,
-  //     commandName: 'setToolActive',
-  //     commandOptions: { toolName: 'Bidirectional' },
-  //     onClick: () => console.log('Activate Bidirectional'),
-  //   },
-  //   {
-  //     id: 'Elipse',
-  //     label: 'Elipse',
-  //     icon: 'tool-elipse',
-  //     type: null,
-  //     commandName: 'setToolActive',
-  //     commandOptions: { toolName: 'Elipse' },
-  //     onClick: () => console.log('Activate Elipse'),
-  //   },
-  //   {
-  //     id: 'Length',
-  //     label: 'Length',
-  //     icon: 'tool-length',
-  //     type: null,
-  //     commandName: 'setToolActive',
-  //     commandOptions: { toolName: 'Length' },
-  //     onClick: () => console.log('Activate Length'),
-  //   },
-  // ];
-  return <Toolbar type="secondary" tools={tools} />;
-}
-
-SecondaryToolbar.propTypes = {
-  tools: PropTypes.array.isRequired,
-};
-
-export default SecondaryToolbar;
diff --git a/extensions/default/src/ViewerLayout/index.jsx b/extensions/default/src/ViewerLayout/index.jsx
index 7d5d2204f..e48610f8e 100644
--- a/extensions/default/src/ViewerLayout/index.jsx
+++ b/extensions/default/src/ViewerLayout/index.jsx
@@ -1,9 +1,8 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { SidePanel } from '@ohif/ui';
+import { SidePanel, Toolbar } from '@ohif/ui';
 //
 import Header from './Header.jsx';
-import SecondaryToolbar from './SecondaryToolbar.jsx';
 
 function ViewerLayout({
   // From Extension Module Params
@@ -68,7 +67,7 @@ function ViewerLayout({
         />
         <div className="flex flex-col flex-1 h-full pb-2">
           <div className="flex flex-2 w-100 border-b border-transparent h-12">
-            <SecondaryToolbar tools={secondaryToolBarLayout.tools} />
+            <Toolbar type="secondary" tools={secondaryToolBarLayout.tools} />
           </div>
           <div className="flex flex-1 h-full overflow-hidden bg-black items-center justify-center">
             <ViewportGrid />