diff --git a/new-lamassu-admin/src/components/ConfirmDialog.jsx b/new-lamassu-admin/src/components/ConfirmDialog.jsx
index b7d9b893..487b2798 100644
--- a/new-lamassu-admin/src/components/ConfirmDialog.jsx
+++ b/new-lamassu-admin/src/components/ConfirmDialog.jsx
@@ -1,9 +1,7 @@
-import {
-  Dialog,
-  DialogActions,
-  DialogContent,
-  InputLabel
-} from '@mui/material'
+import Dialog from '@mui/material/Dialog'
+import DialogActions from '@mui/material/DialogActions'
+import DialogContent from '@mui/material/DialogContent'
+import InputLabel from '@mui/material/InputLabel'
 import { makeStyles } from '@mui/styles'
 import React, { memo, useState } from 'react'
 import { H4, P } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/components/DeleteDialog.jsx b/new-lamassu-admin/src/components/DeleteDialog.jsx
index 1e334725..a45b6f78 100644
--- a/new-lamassu-admin/src/components/DeleteDialog.jsx
+++ b/new-lamassu-admin/src/components/DeleteDialog.jsx
@@ -1,8 +1,6 @@
-import {
-  Dialog,
-  DialogActions,
-  DialogContent,
-} from '@mui/material'
+import Dialog from '@mui/material/Dialog'
+import DialogActions from '@mui/material/DialogActions'
+import DialogContent from '@mui/material/DialogContent'
 import { makeStyles } from '@mui/styles'
 import React from 'react'
 import { H4, P } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/components/ImagePopper.jsx b/new-lamassu-admin/src/components/ImagePopper.jsx
index 1aa2be09..8053819e 100644
--- a/new-lamassu-admin/src/components/ImagePopper.jsx
+++ b/new-lamassu-admin/src/components/ImagePopper.jsx
@@ -1,4 +1,4 @@
-import { ClickAwayListener } from '@mui/material'
+import ClickAwayListener from '@mui/material/ClickAwayListener'
 import { makeStyles } from '@mui/styles'
 import classnames from 'classnames'
 import React, { memo, useState } from 'react'
diff --git a/new-lamassu-admin/src/components/InfoMessage.jsx b/new-lamassu-admin/src/components/InfoMessage.jsx
index 1e701d4d..8e59fd90 100644
--- a/new-lamassu-admin/src/components/InfoMessage.jsx
+++ b/new-lamassu-admin/src/components/InfoMessage.jsx
@@ -1,4 +1,4 @@
-import { Box } from '@mui/material'
+import Box from '@mui/material/Box'
 import { makeStyles } from '@mui/styles'
 import React from 'react'
 import { Label1 } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/components/InformativeDialog.jsx b/new-lamassu-admin/src/components/InformativeDialog.jsx
index 149984bf..a4c0a8f8 100644
--- a/new-lamassu-admin/src/components/InformativeDialog.jsx
+++ b/new-lamassu-admin/src/components/InformativeDialog.jsx
@@ -1,4 +1,5 @@
-import { Dialog, DialogContent } from '@mui/material'
+import Dialog from '@mui/material/Dialog'
+import DialogContent from '@mui/material/DialogContent'
 import { makeStyles } from '@mui/styles'
 import React, { memo } from 'react'
 import { H1 } from 'src/components/typography'
diff --git a/new-lamassu-admin/src/components/LogsDownloaderPopper.jsx b/new-lamassu-admin/src/components/LogsDownloaderPopper.jsx
index c4914fde..ff877809 100644
--- a/new-lamassu-admin/src/components/LogsDownloaderPopper.jsx
+++ b/new-lamassu-admin/src/components/LogsDownloaderPopper.jsx
@@ -1,5 +1,5 @@
 import { useLazyQuery } from "@apollo/client";
-import { ClickAwayListener } from '@mui/material'
+import ClickAwayListener from '@mui/material/ClickAwayListener'
 import { makeStyles } from '@mui/styles'
 import classnames from 'classnames'
 import { format, set } from 'date-fns/fp'
diff --git a/new-lamassu-admin/src/components/Modal.jsx b/new-lamassu-admin/src/components/Modal.jsx
index 062b8425..147a144b 100644
--- a/new-lamassu-admin/src/components/Modal.jsx
+++ b/new-lamassu-admin/src/components/Modal.jsx
@@ -1,4 +1,5 @@
-import { Modal as MaterialModal, Paper } from '@mui/material'
+import MaterialModal from '@mui/material/Modal'
+import Paper from '@mui/material/Paper'
 import { makeStyles } from '@mui/styles'
 import classnames from 'classnames'
 import React from 'react'
diff --git a/new-lamassu-admin/src/components/Popper.jsx b/new-lamassu-admin/src/components/Popper.jsx
index 30203f97..6dc22225 100644
--- a/new-lamassu-admin/src/components/Popper.jsx
+++ b/new-lamassu-admin/src/components/Popper.jsx
@@ -1,4 +1,5 @@
-import { Popper as MaterialPopper, Paper } from '@mui/material'
+import MaterialPopper from '@mui/material/Popper'
+import Paper from '@mui/material/Paper'
 import { makeStyles } from '@mui/styles'
 import classnames from 'classnames'
 import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/components/Tooltip.jsx b/new-lamassu-admin/src/components/Tooltip.jsx
index 701aa019..863dc417 100644
--- a/new-lamassu-admin/src/components/Tooltip.jsx
+++ b/new-lamassu-admin/src/components/Tooltip.jsx
@@ -1,4 +1,4 @@
-import { ClickAwayListener } from '@mui/material'
+import ClickAwayListener from '@mui/material/ClickAwayListener'
 import { makeStyles } from '@mui/styles'
 import * as R from 'ramda'
 import React, { useState, memo } from 'react'
diff --git a/new-lamassu-admin/src/components/buttons/IDButton.jsx b/new-lamassu-admin/src/components/buttons/IDButton.jsx
index a955d47d..122c8975 100644
--- a/new-lamassu-admin/src/components/buttons/IDButton.jsx
+++ b/new-lamassu-admin/src/components/buttons/IDButton.jsx
@@ -1,4 +1,4 @@
-import { ClickAwayListener } from '@mui/material'
+import ClickAwayListener from '@mui/material/ClickAwayListener'
 import { makeStyles } from '@mui/styles'
 import classnames from 'classnames'
 import React, { useState, memo } from 'react'
diff --git a/new-lamassu-admin/src/components/buttons/IconButton.jsx b/new-lamassu-admin/src/components/buttons/IconButton.jsx
index 52661a22..ee130961 100644
--- a/new-lamassu-admin/src/components/buttons/IconButton.jsx
+++ b/new-lamassu-admin/src/components/buttons/IconButton.jsx
@@ -1,4 +1,4 @@
-import { IconButton as IconB } from '@mui/material'
+import IconB from '@mui/material/IconButton'
 import { makeStyles } from '@mui/styles'
 import React from 'react'
 
diff --git a/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx b/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx
index f4e46ae3..43395879 100644
--- a/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx
+++ b/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx
@@ -1,4 +1,4 @@
-import { Box } from '@mui/material'
+import Box from '@mui/material/Box'
 import MAutocomplete from '@mui/material/Autocomplete'
 import sort from 'match-sorter'
 import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx b/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx
index efd6ce33..11f1bfdd 100644
--- a/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx
+++ b/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx
@@ -1,8 +1,6 @@
-import {
-  Radio,
-  RadioGroup as MRadioGroup,
-  FormControlLabel
-} from '@mui/material'
+import Radio from '@mui/material/Radio'
+import MRadioGroup from '@mui/material/RadioGroup'
+import FormControlLabel from '@mui/material/FormControlLabel'
 import { makeStyles } from '@mui/styles'
 import classnames from 'classnames'
 import React from 'react'
diff --git a/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx b/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx
index 66a051fc..e236e42f 100644
--- a/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx
+++ b/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx
@@ -1,5 +1,6 @@
 import { makeStyles } from '@mui/styles'
-import { ToggleButtonGroup as MUIToggleButtonGroup, ToggleButton } from '@mui/material'
+import MUIToggleButtonGroup from '@mui/material/ToggleButtonGroup'
+import ToggleButton from '@mui/material/ToggleButton'
 import React from 'react'
 import { H4, P } from 'src/components/typography'
 
diff --git a/new-lamassu-admin/src/components/layout/TitleSection.jsx b/new-lamassu-admin/src/components/layout/TitleSection.jsx
index 49755be6..6944a22c 100644
--- a/new-lamassu-admin/src/components/layout/TitleSection.jsx
+++ b/new-lamassu-admin/src/components/layout/TitleSection.jsx
@@ -1,4 +1,4 @@
-import { Box } from '@mui/material'
+import Box from '@mui/material/Box'
 import { makeStyles } from '@mui/styles'
 import classnames from 'classnames'
 import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/components/tables/DataTable.jsx b/new-lamassu-admin/src/components/tables/DataTable.jsx
index c31d0a29..6c55fd54 100644
--- a/new-lamassu-admin/src/components/tables/DataTable.jsx
+++ b/new-lamassu-admin/src/components/tables/DataTable.jsx
@@ -1,4 +1,4 @@
-import { Box } from '@mui/material'
+import Box from '@mui/material/Box'
 import { makeStyles } from '@mui/styles'
 import classnames from 'classnames'
 import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/pages/AddMachine/AddMachine.jsx b/new-lamassu-admin/src/pages/AddMachine/AddMachine.jsx
index b934041d..03249806 100644
--- a/new-lamassu-admin/src/pages/AddMachine/AddMachine.jsx
+++ b/new-lamassu-admin/src/pages/AddMachine/AddMachine.jsx
@@ -1,5 +1,8 @@
 import { useMutation, useQuery, gql } from "@apollo/client";
-import { Dialog, DialogContent, SvgIcon, IconButton } from '@mui/material'
+import Dialog from '@mui/material/Dialog'
+import DialogContent from '@mui/material/DialogContent'
+import SvgIcon from '@mui/material/SvgIcon'
+import IconButton from '@mui/material/IconButton'
 import { makeStyles } from '@mui/styles'
 import classnames from 'classnames'
 import { Form, Formik, FastField } from 'formik'
diff --git a/new-lamassu-admin/src/pages/Analytics/Analytics.jsx b/new-lamassu-admin/src/pages/Analytics/Analytics.jsx
index 9437df1a..e27f2aa6 100644
--- a/new-lamassu-admin/src/pages/Analytics/Analytics.jsx
+++ b/new-lamassu-admin/src/pages/Analytics/Analytics.jsx
@@ -1,5 +1,5 @@
 import { useQuery, gql } from "@apollo/client";
-import { Box } from '@mui/material'
+import Box from '@mui/material/Box'
 import { makeStyles } from '@mui/styles'
 import classnames from 'classnames'
 import { endOfToday } from 'date-fns'
diff --git a/new-lamassu-admin/src/pages/Analytics/components/tooltips/GraphTooltip.jsx b/new-lamassu-admin/src/pages/Analytics/components/tooltips/GraphTooltip.jsx
index 005543d8..e48bdd87 100644
--- a/new-lamassu-admin/src/pages/Analytics/components/tooltips/GraphTooltip.jsx
+++ b/new-lamassu-admin/src/pages/Analytics/components/tooltips/GraphTooltip.jsx
@@ -1,4 +1,4 @@
-import { Paper } from '@mui/material'
+import Paper from '@mui/material/Paper'
 import { makeStyles } from '@mui/styles'
 import * as R from 'ramda'
 import React, { memo } from 'react'
diff --git a/new-lamassu-admin/src/pages/Analytics/components/wrappers/HourOfDayWrapper.jsx b/new-lamassu-admin/src/pages/Analytics/components/wrappers/HourOfDayWrapper.jsx
index f0a58968..d118de6f 100644
--- a/new-lamassu-admin/src/pages/Analytics/components/wrappers/HourOfDayWrapper.jsx
+++ b/new-lamassu-admin/src/pages/Analytics/components/wrappers/HourOfDayWrapper.jsx
@@ -1,4 +1,4 @@
-import { Box } from '@mui/material'
+import Box from '@mui/material/Box'
 import { makeStyles } from '@mui/styles'
 import { getTimezoneOffset } from 'date-fns-tz'
 import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/pages/Analytics/components/wrappers/TopMachinesWrapper.jsx b/new-lamassu-admin/src/pages/Analytics/components/wrappers/TopMachinesWrapper.jsx
index e6eb81d3..e296c17b 100644
--- a/new-lamassu-admin/src/pages/Analytics/components/wrappers/TopMachinesWrapper.jsx
+++ b/new-lamassu-admin/src/pages/Analytics/components/wrappers/TopMachinesWrapper.jsx
@@ -1,4 +1,4 @@
-import { Box } from '@mui/material'
+import Box from '@mui/material/Box'
 import { makeStyles } from '@mui/styles'
 import * as R from 'ramda'
 import React, { useState } from 'react'
diff --git a/new-lamassu-admin/src/pages/Authentication/Login.jsx b/new-lamassu-admin/src/pages/Authentication/Login.jsx
index 060b4299..ab883a64 100644
--- a/new-lamassu-admin/src/pages/Authentication/Login.jsx
+++ b/new-lamassu-admin/src/pages/Authentication/Login.jsx
@@ -1,4 +1,4 @@
-import { Grid } from '@mui/material'
+import Grid from '@mui/material/Grid'
 import { makeStyles } from '@mui/styles'
 import React from 'react'
 
diff --git a/new-lamassu-admin/src/pages/Authentication/Register.jsx b/new-lamassu-admin/src/pages/Authentication/Register.jsx
index ef7a4703..cec03435 100644
--- a/new-lamassu-admin/src/pages/Authentication/Register.jsx
+++ b/new-lamassu-admin/src/pages/Authentication/Register.jsx
@@ -1,5 +1,5 @@
 import { useQuery, useMutation, gql } from "@apollo/client";
-import { Grid } from '@mui/material'
+import Grid from '@mui/material/Grid'
 import { makeStyles } from '@mui/styles'
 import Paper from '@mui/material/Paper'
 import { Field, Form, Formik } from 'formik'
diff --git a/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx b/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx
index cff60ae5..e16e1fd8 100644
--- a/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx
+++ b/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx
@@ -1,5 +1,5 @@
 import { useQuery, useMutation, gql } from "@apollo/client";
-import { Grid } from '@mui/material'
+import Grid from '@mui/material/Grid'
 import { makeStyles } from '@mui/styles'
 import Paper from '@mui/material/Paper'
 import { Form, Formik } from 'formik'
diff --git a/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx b/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx
index 4eab703c..5c9392b6 100644
--- a/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx
+++ b/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx
@@ -1,5 +1,5 @@
 import { useQuery, useMutation, gql } from "@apollo/client";
-import { Grid } from '@mui/material'
+import Grid from '@mui/material/Grid'
 import { makeStyles } from '@mui/styles'
 import Paper from '@mui/material/Paper'
 import { Field, Form, Formik } from 'formik'
diff --git a/new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx b/new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx
index 951b9ff4..694dd839 100644
--- a/new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx
+++ b/new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx
@@ -1,5 +1,8 @@
 import { useQuery, useMutation, gql } from "@apollo/client";
-import { Box, Dialog, DialogContent, DialogActions } from '@mui/material'
+import Box from '@mui/material/Box'
+import Dialog from '@mui/material/Dialog'
+import DialogContent from '@mui/material/DialogContent'
+import DialogActions from '@mui/material/DialogActions'
 import Switch from '@mui/material/Switch'
 import { makeStyles } from '@mui/styles'
 import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.jsx b/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.jsx
index feafa19f..7e5b4dd0 100644
--- a/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.jsx
+++ b/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.jsx
@@ -1,4 +1,4 @@
-import { Box } from '@mui/material'
+import Box from '@mui/material/Box'
 import { makeStyles } from '@mui/styles'
 import { Formik, Form, Field } from 'formik'
 import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/pages/Customers/CustomerPhotos.jsx b/new-lamassu-admin/src/pages/Customers/CustomerPhotos.jsx
index 4c51ae02..7fb0b767 100644
--- a/new-lamassu-admin/src/pages/Customers/CustomerPhotos.jsx
+++ b/new-lamassu-admin/src/pages/Customers/CustomerPhotos.jsx
@@ -1,4 +1,4 @@
-import { Paper } from '@mui/material'
+import Paper from '@mui/material/Paper'
 import { makeStyles } from '@mui/styles'
 import { format } from 'date-fns/fp'
 import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx b/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx
index d748ba0f..bd52274d 100644
--- a/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx
+++ b/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx
@@ -1,11 +1,9 @@
 import { useQuery, useMutation, useLazyQuery, gql } from "@apollo/client";
-import {
-  Breadcrumbs,
-  Box,
-  DialogActions,
-  DialogContent,
-  Dialog
-} from '@mui/material'
+import Breadcrumbs from '@mui/material/Breadcrumbs'
+import Box from '@mui/material/Box'
+import DialogActions from '@mui/material/DialogActions'
+import DialogContent from '@mui/material/DialogContent'
+import Dialog from '@mui/material/Dialog'
 import Switch from '@mui/material/Switch'
 import { makeStyles } from '@mui/styles'
 import NavigateNextIcon from '@mui/icons-material/NavigateNext'
diff --git a/new-lamassu-admin/src/pages/Customers/Customers.jsx b/new-lamassu-admin/src/pages/Customers/Customers.jsx
index e2aa5af8..7c8657c1 100644
--- a/new-lamassu-admin/src/pages/Customers/Customers.jsx
+++ b/new-lamassu-admin/src/pages/Customers/Customers.jsx
@@ -1,5 +1,5 @@
 import { useQuery, useMutation, gql } from "@apollo/client";
-import { Box } from '@mui/material'
+import Box from '@mui/material/Box'
 import { makeStyles } from '@mui/styles'
 import * as R from 'ramda'
 import React, { useState } from 'react'
diff --git a/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.jsx b/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.jsx
index e3596921..4dd04418 100644
--- a/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.jsx
@@ -1,4 +1,4 @@
-import { Box } from '@mui/material'
+import Box from '@mui/material/Box'
 import { makeStyles } from '@mui/styles'
 import * as R from 'ramda'
 import React, { memo } from 'react'
diff --git a/new-lamassu-admin/src/pages/Customers/components/EditableCard.jsx b/new-lamassu-admin/src/pages/Customers/components/EditableCard.jsx
index 1952a0c3..682ad41e 100644
--- a/new-lamassu-admin/src/pages/Customers/components/EditableCard.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/EditableCard.jsx
@@ -1,4 +1,6 @@
-import { CardContent, Card, Grid } from '@mui/material'
+import CardContent from '@mui/material/CardContent'
+import Card from '@mui/material/Card'
+import Grid from '@mui/material/Grid'
 import { makeStyles } from '@mui/styles'
 import classnames from 'classnames'
 import { Form, Formik, Field as FormikField } from 'formik'
diff --git a/new-lamassu-admin/src/pages/Customers/components/FrontCameraPhoto.jsx b/new-lamassu-admin/src/pages/Customers/components/FrontCameraPhoto.jsx
index 549f4fce..4dcee494 100644
--- a/new-lamassu-admin/src/pages/Customers/components/FrontCameraPhoto.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/FrontCameraPhoto.jsx
@@ -1,4 +1,4 @@
-import { Paper } from '@mui/material'
+import Paper from '@mui/material/Paper'
 import { makeStyles } from '@mui/styles'
 import React, { memo } from 'react'
 import CrossedCameraIcon from 'src/styling/icons/ID/photo/crossed-camera.svg?react'
diff --git a/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.jsx b/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.jsx
index 1853e8e3..a2b81cd7 100644
--- a/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.jsx
@@ -1,4 +1,4 @@
-import { Box } from '@mui/material'
+import Box from '@mui/material/Box'
 import { makeStyles } from '@mui/styles'
 import * as R from 'ramda'
 import React, { memo } from 'react'
diff --git a/new-lamassu-admin/src/pages/Customers/components/IdDataCard.jsx b/new-lamassu-admin/src/pages/Customers/components/IdDataCard.jsx
index f7023eea..8ead9dc0 100644
--- a/new-lamassu-admin/src/pages/Customers/components/IdDataCard.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/IdDataCard.jsx
@@ -1,4 +1,4 @@
-import { Box } from '@mui/material'
+import Box from '@mui/material/Box'
 import { differenceInYears, format, parse } from 'date-fns/fp'
 import * as R from 'ramda'
 import React, { memo } from 'react'
diff --git a/new-lamassu-admin/src/pages/Customers/components/TransactionsList.jsx b/new-lamassu-admin/src/pages/Customers/components/TransactionsList.jsx
index 771f20c0..ef9fbfc9 100644
--- a/new-lamassu-admin/src/pages/Customers/components/TransactionsList.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/TransactionsList.jsx
@@ -1,5 +1,5 @@
 import { toUnit } from '@lamassu/coins/lightUtils'
-import { Box } from '@mui/material'
+import Box from '@mui/material/Box'
 import { makeStyles } from '@mui/styles'
 import BigNumber from 'bignumber.js'
 import classnames from 'classnames'
diff --git a/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteCard.jsx b/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteCard.jsx
index c4c9b7cc..9bef903a 100644
--- a/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteCard.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteCard.jsx
@@ -1,4 +1,4 @@
-import { Paper } from '@mui/material'
+import Paper from '@mui/material/Paper'
 import { makeStyles } from '@mui/styles'
 import classNames from 'classnames'
 import { React } from 'react'
diff --git a/new-lamassu-admin/src/pages/Customers/components/notes/NoteCard.jsx b/new-lamassu-admin/src/pages/Customers/components/notes/NoteCard.jsx
index 07ef4889..c4a4f21a 100644
--- a/new-lamassu-admin/src/pages/Customers/components/notes/NoteCard.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/notes/NoteCard.jsx
@@ -1,4 +1,4 @@
-import { Paper } from '@mui/material'
+import Paper from '@mui/material/Paper'
 import { makeStyles } from '@mui/styles'
 import * as R from 'ramda'
 import { React } from 'react'
diff --git a/new-lamassu-admin/src/pages/Customers/components/notes/NoteEdit.jsx b/new-lamassu-admin/src/pages/Customers/components/notes/NoteEdit.jsx
index 6b979eb7..3fac6309 100644
--- a/new-lamassu-admin/src/pages/Customers/components/notes/NoteEdit.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/notes/NoteEdit.jsx
@@ -1,4 +1,4 @@
-import { Paper } from '@mui/material'
+import Paper from '@mui/material/Paper'
 import { makeStyles } from '@mui/styles'
 import { formatDurationWithOptions, intervalToDuration } from 'date-fns/fp'
 import { Form, Formik, Field } from 'formik'
diff --git a/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.jsx b/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.jsx
index 3d2c4036..4aa22ab9 100644
--- a/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.jsx
@@ -1,4 +1,4 @@
-import { Paper } from '@mui/material'
+import Paper from '@mui/material/Paper'
 import { makeStyles } from '@mui/styles'
 import classnames from 'classnames'
 import React, { memo } from 'react'
diff --git a/new-lamassu-admin/src/pages/Customers/helper.jsx b/new-lamassu-admin/src/pages/Customers/helper.jsx
index bbfd9b20..3fa95175 100644
--- a/new-lamassu-admin/src/pages/Customers/helper.jsx
+++ b/new-lamassu-admin/src/pages/Customers/helper.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { Box } from '@mui/material'
+import Box from '@mui/material/Box'
 import { makeStyles } from '@mui/styles'
 import classnames from 'classnames'
 import { parse, isValid, format } from 'date-fns/fp'
diff --git a/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx b/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx
index f2f1ff44..a79f187d 100644
--- a/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx
+++ b/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx
@@ -1,5 +1,5 @@
 import { useQuery, useMutation, gql } from "@apollo/client";
-import { Box } from '@mui/material'
+import Box from '@mui/material/Box'
 import { makeStyles } from '@mui/styles'
 import * as R from 'ramda'
 import React, { useState } from 'react'
diff --git a/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx b/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx
index 33aec913..ed3ecd1b 100644
--- a/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx
+++ b/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx
@@ -1,5 +1,5 @@
 import { useQuery, useMutation, gql } from "@apollo/client";
-import { Box } from '@mui/material'
+import Box from '@mui/material/Box'
 import { makeStyles } from '@mui/styles'
 import * as R from 'ramda'
 import React, { useState } from 'react'
diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.jsx b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.jsx
index cde79f18..1957f2af 100644
--- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.jsx
+++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.jsx
@@ -1,4 +1,4 @@
-import { Box } from '@mui/material'
+import Box from '@mui/material/Box'
 import { makeStyles } from '@mui/styles'
 import classnames from 'classnames'
 import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx b/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx
index 8508edb0..9377e1e3 100644
--- a/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx
+++ b/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx
@@ -1,5 +1,6 @@
 import { useQuery, useMutation, gql } from "@apollo/client";
-import { DialogActions, Box } from '@mui/material'
+import DialogActions from '@mui/material/DialogActions'
+import Box from '@mui/material/Box'
 import { makeStyles } from '@mui/styles'
 import * as R from 'ramda'
 import React, { useState } from 'react'
diff --git a/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx b/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx
index d9b5c8f9..797f312a 100644
--- a/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx
+++ b/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx
@@ -1,4 +1,4 @@
-import { Grid /*, Divider */ } from '@mui/material'
+import Grid from '@mui/material/Grid'
 import { makeStyles } from '@mui/styles'
 import BigNumber from 'bignumber.js'
 import React from 'react'
diff --git a/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.jsx b/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.jsx
index 278dedff..745891b7 100644
--- a/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.jsx
+++ b/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.jsx
@@ -1,4 +1,4 @@
-import { Chip } from '@mui/material'
+import Chip from '@mui/material/Chip'
 import { makeStyles } from '@mui/styles'
 import { Form, Formik, Field } from 'formik'
 import * as R from 'ramda'
diff --git a/new-lamassu-admin/src/pages/Services/FormRenderer.jsx b/new-lamassu-admin/src/pages/Services/FormRenderer.jsx
index cddc4f6f..599eb8e5 100644
--- a/new-lamassu-admin/src/pages/Services/FormRenderer.jsx
+++ b/new-lamassu-admin/src/pages/Services/FormRenderer.jsx
@@ -1,4 +1,4 @@
-import { Grid } from '@mui/material'
+import Grid from '@mui/material/Grid'
 import { makeStyles } from '@mui/styles'
 import classnames from 'classnames'
 import { Formik, Form, FastField } from 'formik'
diff --git a/new-lamassu-admin/src/pages/Services/Services.jsx b/new-lamassu-admin/src/pages/Services/Services.jsx
index aafe0ff9..22b44c92 100644
--- a/new-lamassu-admin/src/pages/Services/Services.jsx
+++ b/new-lamassu-admin/src/pages/Services/Services.jsx
@@ -1,5 +1,5 @@
 import { useQuery, useMutation, gql } from "@apollo/client";
-import { Grid } from '@mui/material'
+import Grid from '@mui/material/Grid'
 import { makeStyles } from '@mui/styles'
 import * as R from 'ramda'
 import React, { useState } from 'react'
diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx b/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx
index 29464fdf..f4d87525 100644
--- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx
+++ b/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx
@@ -1,6 +1,6 @@
 import { useLazyQuery, useMutation, gql } from "@apollo/client";
 import { toUnit, formatCryptoAddress } from '@lamassu/coins/lightUtils'
-import { Box } from '@mui/material'
+import Box from '@mui/material/Box'
 import { makeStyles } from '@mui/styles'
 import BigNumber from 'bignumber.js'
 import classNames from 'classnames'
diff --git a/new-lamassu-admin/src/pages/Triggers/TriggerView.jsx b/new-lamassu-admin/src/pages/Triggers/TriggerView.jsx
index 193fa0da..b98396d6 100644
--- a/new-lamassu-admin/src/pages/Triggers/TriggerView.jsx
+++ b/new-lamassu-admin/src/pages/Triggers/TriggerView.jsx
@@ -1,5 +1,5 @@
 import { useMutation, gql } from "@apollo/client";
-import { Box } from '@mui/material'
+import Box from '@mui/material/Box'
 import { makeStyles } from '@mui/styles'
 import * as R from 'ramda'
 import React, { useState } from 'react'
diff --git a/new-lamassu-admin/src/pages/Triggers/helper.jsx b/new-lamassu-admin/src/pages/Triggers/helper.jsx
index 1bb0b887..353a7c41 100644
--- a/new-lamassu-admin/src/pages/Triggers/helper.jsx
+++ b/new-lamassu-admin/src/pages/Triggers/helper.jsx
@@ -1,4 +1,4 @@
-import { Box } from '@mui/material'
+import Box from '@mui/material/Box'
 import { makeStyles } from '@mui/styles'
 import classnames from 'classnames'
 import { Field, useFormikContext } from 'formik'
diff --git a/new-lamassu-admin/src/pages/UserManagement/UserManagement.jsx b/new-lamassu-admin/src/pages/UserManagement/UserManagement.jsx
index b6583e5c..271ccba7 100644
--- a/new-lamassu-admin/src/pages/UserManagement/UserManagement.jsx
+++ b/new-lamassu-admin/src/pages/UserManagement/UserManagement.jsx
@@ -1,5 +1,6 @@
 import { useQuery, useMutation, useLazyQuery, gql } from "@apollo/client";
-import { Box, Chip } from '@mui/material'
+import Chip from '@mui/material/Chip'
+import Box from '@mui/material/Box'
 import Switch from '@mui/material/Switch'
 import { makeStyles } from '@mui/styles'
 import { startAttestation } from '@simplewebauthn/browser'
diff --git a/new-lamassu-admin/src/pages/Wizard/Wizard.jsx b/new-lamassu-admin/src/pages/Wizard/Wizard.jsx
index 69f6c597..81087696 100644
--- a/new-lamassu-admin/src/pages/Wizard/Wizard.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/Wizard.jsx
@@ -1,5 +1,6 @@
 import { useQuery, gql } from "@apollo/client";
-import { Dialog, DialogContent } from '@mui/material'
+import Dialog from '@mui/material/Dialog'
+import DialogContent from '@mui/material/DialogContent'
 import { makeStyles } from '@mui/styles'
 import classnames from 'classnames'
 import React, { useState, useContext } from 'react'
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx b/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx
index 32b6ac64..6a0c005c 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx
@@ -1,4 +1,5 @@
-import { Drawer, Grid } from '@mui/material'
+import Drawer from '@mui/material/Drawer'
+import Grid from '@mui/material/Grid'
 import { makeStyles } from '@mui/styles'
 import classnames from 'classnames'
 import React, { useState } from 'react'
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx b/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx
index 5d977304..78bef57b 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx
@@ -1,5 +1,5 @@
 import { useMutation, useQuery, gql } from "@apollo/client";
-import { Box } from '@mui/material'
+import Box from '@mui/material/Box'
 import { makeStyles } from '@mui/styles'
 import classnames from 'classnames'
 import React, { useState } from 'react'