diff --git a/frontend/src/components/TableRowSkeleton/index.js b/frontend/src/components/TableRowSkeleton/index.js
index 411cb03..61ed256 100644
--- a/frontend/src/components/TableRowSkeleton/index.js
+++ b/frontend/src/components/TableRowSkeleton/index.js
@@ -12,32 +12,38 @@ const useStyles = makeStyles(theme => ({
 	},
 }));
 
-const TableRowSkeleton = () => {
+const TableRowSkeleton = ({ avatar, columns }) => {
 	const classes = useStyles();
 	return (
 		<>
 			<TableRow>
-				<TableCell style={{ paddingRight: 0 }}>
-					<Skeleton animation="wave" variant="circle" width={40} height={40} />
-				</TableCell>
-				<TableCell>
-					<Skeleton animation="wave" height={20} width={80} />
-				</TableCell>
-				<TableCell align="center">
-					<div className={classes.customTableCell}>
-						<Skeleton align="center" animation="wave" height={20} width={80} />
-					</div>
-				</TableCell>
-				<TableCell align="center">
-					<div className={classes.customTableCell}>
-						<Skeleton align="center" animation="wave" height={20} width={80} />
-					</div>
-				</TableCell>
-				<TableCell align="center">
-					<div className={classes.customTableCell}>
-						<Skeleton align="center" animation="wave" height={20} width={80} />
-					</div>
-				</TableCell>
+				{avatar && (
+					<>
+						<TableCell style={{ paddingRight: 0 }}>
+							<Skeleton
+								animation="wave"
+								variant="circle"
+								width={40}
+								height={40}
+							/>
+						</TableCell>
+						<TableCell>
+							<Skeleton animation="wave" height={30} width={80} />
+						</TableCell>
+					</>
+				)}
+				{Array.from({ length: columns }, (_, index) => (
+					<TableCell align="center" key={index}>
+						<div className={classes.customTableCell}>
+							<Skeleton
+								align="center"
+								animation="wave"
+								height={30}
+								width={80}
+							/>
+						</div>
+					</TableCell>
+				))}
 			</TableRow>
 		</>
 	);
diff --git a/frontend/src/pages/Contacts/index.js b/frontend/src/pages/Contacts/index.js
index d4204d7..e516228 100644
--- a/frontend/src/pages/Contacts/index.js
+++ b/frontend/src/pages/Contacts/index.js
@@ -337,7 +337,7 @@ const Contacts = () => {
 									</TableCell>
 								</TableRow>
 							))}
-							{loading && <TableRowSkeleton />}
+							{loading && <TableRowSkeleton avatar columns={3} />}
 						</>
 					</TableBody>
 				</Table>
diff --git a/frontend/src/pages/Queues/index.js b/frontend/src/pages/Queues/index.js
index e107486..632fea3 100644
--- a/frontend/src/pages/Queues/index.js
+++ b/frontend/src/pages/Queues/index.js
@@ -256,7 +256,7 @@ const Queues = () => {
 									</TableCell>
 								</TableRow>
 							))}
-							{loading && <TableRowSkeleton />}
+							{loading && <TableRowSkeleton columns={4} />}
 						</>
 					</TableBody>
 				</Table>
diff --git a/frontend/src/pages/Users/index.js b/frontend/src/pages/Users/index.js
index a457b5d..f4c8ae6 100644
--- a/frontend/src/pages/Users/index.js
+++ b/frontend/src/pages/Users/index.js
@@ -28,7 +28,6 @@ import { i18n } from "../../translate/i18n";
 import TableRowSkeleton from "../../components/TableRowSkeleton";
 import UserModal from "../../components/UserModal";
 import ConfirmationModal from "../../components/ConfirmationModal";
-import { Avatar } from "@material-ui/core";
 import toastError from "../../errors/toastError";
 
 const reducer = (state, action) => {
@@ -237,8 +236,7 @@ const Users = () => {
 				<Table size="small">
 					<TableHead>
 						<TableRow>
-							<TableCell padding="checkbox" />
-							<TableCell>{i18n.t("users.table.name")}</TableCell>
+							<TableCell align="center">{i18n.t("users.table.name")}</TableCell>
 							<TableCell align="center">
 								{i18n.t("users.table.email")}
 							</TableCell>
@@ -254,10 +252,7 @@ const Users = () => {
 						<>
 							{users.map(user => (
 								<TableRow key={user.id}>
-									<TableCell style={{ paddingRight: 0 }}>
-										{<Avatar />}
-									</TableCell>
-									<TableCell>{user.name}</TableCell>
+									<TableCell align="center">{user.name}</TableCell>
 									<TableCell align="center">{user.email}</TableCell>
 									<TableCell align="center">{user.profile}</TableCell>
 									<TableCell align="center">
@@ -280,7 +275,7 @@ const Users = () => {
 									</TableCell>
 								</TableRow>
 							))}
-							{loading && <TableRowSkeleton />}
+							{loading && <TableRowSkeleton columns={4} />}
 						</>
 					</TableBody>
 				</Table>