diff --git a/src/components/Toolbar/HoverMenuBar/HoverMenuList.js b/src/components/Toolbar/HoverMenuBar/HoverMenuList.js
index 6709977af..11f50796f 100644
--- a/src/components/Toolbar/HoverMenuBar/HoverMenuList.js
+++ b/src/components/Toolbar/HoverMenuBar/HoverMenuList.js
@@ -1,4 +1,4 @@
-import { colors, elevations, spacers } from '@dhis2/ui-constants'
+import { colors, elevations, spacers } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React, { createContext, useCallback, useContext, useState } from 'react'
 import { useHoverMenubarContext } from './HoverMenuBar.js'
diff --git a/src/components/Toolbar/HoverMenuBar/HoverMenuListItem.js b/src/components/Toolbar/HoverMenuBar/HoverMenuListItem.js
index b336d7e87..2ad12d02b 100644
--- a/src/components/Toolbar/HoverMenuBar/HoverMenuListItem.js
+++ b/src/components/Toolbar/HoverMenuBar/HoverMenuListItem.js
@@ -1,6 +1,4 @@
-import { IconChevronRight24 } from '@dhis2/ui-icons'
-import { Popper } from '@dhis2-ui/popper'
-import { Portal } from '@dhis2-ui/portal'
+import { IconChevronRight24, Popper, Portal } from '@dhis2/ui'
 import cx from 'classnames'
 import PropTypes from 'prop-types'
 import React, { useRef } from 'react'
diff --git a/src/components/Toolbar/HoverMenuBar/HoverMenuListItem.styles.js b/src/components/Toolbar/HoverMenuBar/HoverMenuListItem.styles.js
index 3e3d42197..31e0f12eb 100644
--- a/src/components/Toolbar/HoverMenuBar/HoverMenuListItem.styles.js
+++ b/src/components/Toolbar/HoverMenuBar/HoverMenuListItem.styles.js
@@ -1,4 +1,4 @@
-import { colors, spacers } from '@dhis2/ui-constants'
+import { colors, spacers } from '@dhis2/ui'
 import css from 'styled-jsx/css'
 
 export default css`
diff --git a/src/components/Toolbar/MenuButton.styles.js b/src/components/Toolbar/MenuButton.styles.js
index 683567cb8..63982d282 100644
--- a/src/components/Toolbar/MenuButton.styles.js
+++ b/src/components/Toolbar/MenuButton.styles.js
@@ -1,4 +1,4 @@
-import { colors, spacers, theme } from '@dhis2/ui-constants'
+import { colors, spacers, theme } from '@dhis2/ui'
 import css from 'styled-jsx/css'
 
 export default css`
diff --git a/src/components/Toolbar/Toolbar.js b/src/components/Toolbar/Toolbar.js
index f6dcce5e7..8f4cd10a6 100644
--- a/src/components/Toolbar/Toolbar.js
+++ b/src/components/Toolbar/Toolbar.js
@@ -1,4 +1,4 @@
-import { colors } from '@dhis2/ui-constants'
+import { colors } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React from 'react'
 
diff --git a/src/components/Toolbar/ToolbarSidebar.js b/src/components/Toolbar/ToolbarSidebar.js
index 948a9fbed..2a0b4935c 100644
--- a/src/components/Toolbar/ToolbarSidebar.js
+++ b/src/components/Toolbar/ToolbarSidebar.js
@@ -1,4 +1,4 @@
-import { colors } from '@dhis2/ui-constants'
+import { colors } from '@dhis2/ui'
 import cx from 'classnames'
 import PropTypes from 'prop-types'
 import React from 'react'
diff --git a/src/components/Toolbar/UpdateButton.js b/src/components/Toolbar/UpdateButton.js
index 5ac678afa..ee3b2c6ef 100644
--- a/src/components/Toolbar/UpdateButton.js
+++ b/src/components/Toolbar/UpdateButton.js
@@ -1,7 +1,5 @@
 import i18n from '@dhis2/d2-i18n'
-import { colors } from '@dhis2/ui-constants'
-import { IconSync16 } from '@dhis2/ui-icons'
-import { CircularLoader } from '@dhis2-ui/loader'
+import { CircularLoader, IconSync16, colors } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React from 'react'
 import menuButtonStyles from './MenuButton.styles.js'