diff --git a/app/src/components/Containers/Me.js b/app/src/components/Containers/Me.js
index 81bcee0..029736b 100644
--- a/app/src/components/Containers/Me.js
+++ b/app/src/components/Containers/Me.js
@@ -141,8 +141,7 @@ const Me = (props) =>
 		webcamProducer,
 		screenProducer,
 		canShareScreen,
-		classes,
-		theme
+		classes
 	} = props;
 
 	const videoVisible = (
@@ -312,7 +311,7 @@ const Me = (props) =>
 							}, 2000);
 						}}
 					>
-						<p className={hover && 'hover'}>
+						<p className={hover ? 'hover' : null}>
 							<FormattedMessage
 								id='room.me'
 								defaultMessage='ME'
@@ -455,7 +454,7 @@ const Me = (props) =>
 			</div>
 			{ screenProducer &&
 				<div
-					className={classnames(classes.root, 'screen', hover && 'hover')}
+					className={classnames(classes.root, 'screen', hover ? 'hover' : null)}
 					onMouseOver={() => setHover(true)}
 					onMouseOut={() => setHover(false)}
 					onTouchStart={() =>
@@ -501,7 +500,7 @@ const Me = (props) =>
 								}, 2000);
 							}}
 						>
-							<p className={hover && 'hover'}>
+							<p className={hover ? 'hover' : null}>
 								<FormattedMessage
 									id='room.me'
 									defaultMessage='ME'
diff --git a/app/src/components/Containers/Peer.js b/app/src/components/Containers/Peer.js
index 3e666d2..758723d 100644
--- a/app/src/components/Containers/Peer.js
+++ b/app/src/components/Containers/Peer.js
@@ -168,8 +168,8 @@ const Peer = (props) =>
 					classnames(
 						classes.root,
 						'webcam',
-						hover && 'hover',
-						activeSpeaker && 'active-speaker'
+						hover ? 'hover' : null,
+						activeSpeaker ? 'active-speaker' : null
 					)
 				}
 				onMouseOver={() => setHover(true)}
@@ -206,7 +206,7 @@ const Peer = (props) =>
 					}
 
 					<div
-						className={classnames(classes.controls, hover && 'hover')}
+						className={classnames(classes.controls, hover ? 'hover' : null)}
 						onMouseOver={() => setHover(true)}
 						onMouseOut={() => setHover(false)}
 						onTouchStart={() =>
@@ -352,7 +352,7 @@ const Peer = (props) =>
 
 			{ screenConsumer &&
 				<div
-					className={classnames(classes.root, 'screen', hover && 'hover')}
+					className={classnames(classes.root, 'screen', hover ? 'hover' : null)}
 					onMouseOver={() => setHover(true)}
 					onMouseOut={() => setHover(false)}
 					onTouchStart={() =>
@@ -386,7 +386,7 @@ const Peer = (props) =>
 							</div>
 						}
 						<div
-							className={classnames(classes.controls, hover && 'hover')}
+							className={classnames(classes.controls, hover ? 'hover' : null)}
 							onMouseOver={() => setHover(true)}
 							onMouseOut={() => setHover(false)}
 							onTouchStart={() =>