diff --git a/src/components/Message/InlineMedia.tsx b/src/components/Message/InlineMedia.tsx
index a6c865c..7d92d48 100644
--- a/src/components/Message/InlineMedia.tsx
+++ b/src/components/Message/InlineMedia.tsx
@@ -1,7 +1,7 @@
 import { useContext, useEffect, useRef, useState } from 'react'
 import { TorrentFile } from 'webtorrent'
 import CircularProgress from '@mui/material/CircularProgress'
-import { Typography } from '@mui/material'
+import Typography from '@mui/material/Typography'
 
 import { fileTransfer } from 'services/FileTransfer'
 import { ShellContext } from 'contexts/ShellContext'
diff --git a/src/components/Room/RoomHideRoomControls.tsx b/src/components/Room/RoomHideRoomControls.tsx
index 5e6ba5f..7ef3770 100644
--- a/src/components/Room/RoomHideRoomControls.tsx
+++ b/src/components/Room/RoomHideRoomControls.tsx
@@ -1,9 +1,9 @@
 import { useContext } from 'react'
 
+import Box from '@mui/material/Box'
 import Fab from '@mui/material/Fab'
 import Tooltip from '@mui/material/Tooltip'
 import { ExpandLess } from '@mui/icons-material'
-import { Box } from '@mui/material'
 
 import { ShellContext } from 'contexts/ShellContext'
 
diff --git a/src/components/Room/RoomShowMessagesControls.tsx b/src/components/Room/RoomShowMessagesControls.tsx
index 125513a..0f4ff2e 100644
--- a/src/components/Room/RoomShowMessagesControls.tsx
+++ b/src/components/Room/RoomShowMessagesControls.tsx
@@ -1,8 +1,9 @@
 import { useContext } from 'react'
 
 import Tooltip from '@mui/material/Tooltip'
+import Badge from '@mui/material/Badge'
+import Box from '@mui/material/Box'
 import { Comment, CommentsDisabled } from '@mui/icons-material'
-import { Badge, Box } from '@mui/material'
 
 import { RoomContext } from 'contexts/RoomContext'
 
diff --git a/src/components/Room/TypingStatusBar.tsx b/src/components/Room/TypingStatusBar.tsx
index cfbf352..b4decd9 100644
--- a/src/components/Room/TypingStatusBar.tsx
+++ b/src/components/Room/TypingStatusBar.tsx
@@ -1,6 +1,6 @@
-import Box from '@mui/material/Box'
-import { Typography } from '@mui/material'
 import { useContext } from 'react'
+import Box from '@mui/material/Box'
+import Typography from '@mui/material/Typography'
 import { ShellContext } from 'contexts/ShellContext'
 import {
   PeerNameDisplay,
diff --git a/src/components/Shell/PeerListItem.tsx b/src/components/Shell/PeerListItem.tsx
index e425fcd..ac49753 100644
--- a/src/components/Shell/PeerListItem.tsx
+++ b/src/components/Shell/PeerListItem.tsx
@@ -3,7 +3,7 @@ import ListItemText from '@mui/material/ListItemText'
 import SyncAltIcon from '@mui/icons-material/SyncAlt'
 import NetworkPingIcon from '@mui/icons-material/NetworkPing'
 import ListItem from '@mui/material/ListItem'
-import { Tooltip } from '@mui/material'
+import Tooltip from '@mui/material/Tooltip'
 
 import { AudioVolume } from 'components/AudioVolume'
 import { PeerNameDisplay } from 'components/PeerNameDisplay'
diff --git a/src/components/Shell/QRCodeDialog.tsx b/src/components/Shell/QRCodeDialog.tsx
index 2fcb3c8..9cbeab5 100644
--- a/src/components/Shell/QRCodeDialog.tsx
+++ b/src/components/Shell/QRCodeDialog.tsx
@@ -1,12 +1,9 @@
-import {
-  Button,
-  Dialog,
-  DialogActions,
-  DialogContent,
-  DialogTitle,
-  IconButton,
-} from '@mui/material'
-import React from 'react'
+import Button from '@mui/material/Button'
+import Dialog from '@mui/material/Dialog'
+import DialogActions from '@mui/material/DialogActions'
+import DialogContent from '@mui/material/DialogContent'
+import DialogTitle from '@mui/material/DialogTitle'
+import IconButton from '@mui/material/IconButton'
 import CloseIcon from '@mui/icons-material/Close'
 import { QRCode } from 'react-qrcode-logo'
 
diff --git a/src/components/Shell/RoomShareDialog.tsx b/src/components/Shell/RoomShareDialog.tsx
index 238ddb9..b2e326d 100644
--- a/src/components/Shell/RoomShareDialog.tsx
+++ b/src/components/Shell/RoomShareDialog.tsx
@@ -1,18 +1,15 @@
-import {
-  Alert,
-  AlertColor,
-  Button,
-  Checkbox,
-  Dialog,
-  DialogActions,
-  DialogContent,
-  DialogContentText,
-  DialogTitle,
-  IconButton,
-  FormControlLabel,
-  TextField,
-  Tooltip,
-} from '@mui/material'
+import Alert, { AlertColor } from '@mui/material/Alert'
+import Button from '@mui/material/Button'
+import Checkbox from '@mui/material/Checkbox'
+import Dialog from '@mui/material/Dialog'
+import DialogActions from '@mui/material/DialogActions'
+import DialogContent from '@mui/material/DialogContent'
+import DialogContentText from '@mui/material/DialogContentText'
+import DialogTitle from '@mui/material/DialogTitle'
+import IconButton from '@mui/material/IconButton'
+import FormControlLabel from '@mui/material/FormControlLabel'
+import TextField from '@mui/material/TextField'
+import Tooltip from '@mui/material/Tooltip'
 import CloseIcon from '@mui/icons-material/Close'
 
 import { AlertOptions } from 'models/shell'