diff --git a/app/src/components/Containers/Me.js b/app/src/components/Containers/Me.js
index ea6e9e0..8d45473 100644
--- a/app/src/components/Containers/Me.js
+++ b/app/src/components/Containers/Me.js
@@ -400,195 +400,207 @@ const Me = (props) =>
 							<React.Fragment>
 								<Tooltip title={micTip} placement='left'>
 									{ smallContainer ?
-										<IconButton
-											aria-label={intl.formatMessage({
-												id             : 'device.muteAudio',
-												defaultMessage : 'Mute audio'
-											})}
-											className={classes.smallContainer}
-											disabled={!me.canSendMic || me.audioInProgress}
-											color={micState === 'on' ? 'primary' : 'secondary'}
-											size='small'
-											onClick={() =>
-											{
-												if (micState === 'off')
-													roomClient.enableMic();
-												else if (micState === 'on')
-													roomClient.muteMic();
-												else
-													roomClient.unmuteMic();
-											}}
-										>
-											{ micState === 'on' ?
-												<MicIcon />
-												:
-												<MicOffIcon />
-											}
-										</IconButton>
+										<div>
+											<IconButton
+												aria-label={intl.formatMessage({
+													id             : 'device.muteAudio',
+													defaultMessage : 'Mute audio'
+												})}
+												className={classes.smallContainer}
+												disabled={!me.canSendMic || me.audioInProgress}
+												color={micState === 'on' ? 'primary' : 'secondary'}
+												size='small'
+												onClick={() =>
+												{
+													if (micState === 'off')
+														roomClient.enableMic();
+													else if (micState === 'on')
+														roomClient.muteMic();
+													else
+														roomClient.unmuteMic();
+												}}
+											>
+												{ micState === 'on' ?
+													<MicIcon />
+													:
+													<MicOffIcon />
+												}
+											</IconButton>
+										</div>
 										:
-										<Fab
-											aria-label={intl.formatMessage({
-												id             : 'device.muteAudio',
-												defaultMessage : 'Mute audio'
-											})}
-											className={classes.fab}
-											disabled={!me.canSendMic || me.audioInProgress}
-											color={micState === 'on' ? 'default' : 'secondary'}
-											size='large'
-											onClick={() =>
-											{
-												if (micState === 'off')
-													roomClient.enableMic();
-												else if (micState === 'on')
-													roomClient.muteMic();
-												else
-													roomClient.unmuteMic();
-											}}
-										>
-											{ micState === 'on' ?
-												<MicIcon />
-												:
-												<MicOffIcon />
-											}
-										</Fab>
+										<div>
+											<Fab
+												aria-label={intl.formatMessage({
+													id             : 'device.muteAudio',
+													defaultMessage : 'Mute audio'
+												})}
+												className={classes.fab}
+												disabled={!me.canSendMic || me.audioInProgress}
+												color={micState === 'on' ? 'default' : 'secondary'}
+												size='large'
+												onClick={() =>
+												{
+													if (micState === 'off')
+														roomClient.enableMic();
+													else if (micState === 'on')
+														roomClient.muteMic();
+													else
+														roomClient.unmuteMic();
+												}}
+											>
+												{ micState === 'on' ?
+													<MicIcon />
+													:
+													<MicOffIcon />
+												}
+											</Fab>
+										</div>
 									}
 								</Tooltip>
 								<Tooltip title={webcamTip} placement='left'>
 									{ smallContainer ?
-										<IconButton
-											aria-label={intl.formatMessage({
-												id             : 'device.startVideo',
-												defaultMessage : 'Start video'
-											})}
-											className={classes.smallContainer}
-											disabled={!me.canSendWebcam || me.webcamInProgress}
-											color={webcamState === 'on' ? 'primary' : 'secondary'}
-											size='small'
-											onClick={() =>
-											{
-												webcamState === 'on' ?
-													roomClient.disableWebcam() :
-													roomClient.enableWebcam();
-											}}
-										>
-											{ webcamState === 'on' ?
-												<VideoIcon />
-												:
-												<VideoOffIcon />
-											}
-										</IconButton>
+										<div>
+											<IconButton
+												aria-label={intl.formatMessage({
+													id             : 'device.startVideo',
+													defaultMessage : 'Start video'
+												})}
+												className={classes.smallContainer}
+												disabled={!me.canSendWebcam || me.webcamInProgress}
+												color={webcamState === 'on' ? 'primary' : 'secondary'}
+												size='small'
+												onClick={() =>
+												{
+													webcamState === 'on' ?
+														roomClient.disableWebcam() :
+														roomClient.enableWebcam();
+												}}
+											>
+												{ webcamState === 'on' ?
+													<VideoIcon />
+													:
+													<VideoOffIcon />
+												}
+											</IconButton>
+										</div>
 										:
-										<Fab
-											aria-label={intl.formatMessage({
-												id             : 'device.startVideo',
-												defaultMessage : 'Start video'
-											})}
-											className={classes.fab}
-											disabled={!me.canSendWebcam || me.webcamInProgress}
-											color={webcamState === 'on' ? 'default' : 'secondary'}
-											size='large'
-											onClick={() =>
-											{
-												webcamState === 'on' ?
-													roomClient.disableWebcam() :
-													roomClient.enableWebcam();
-											}}
-										>
-											{ webcamState === 'on' ?
-												<VideoIcon />
-												:
-												<VideoOffIcon />
-											}
-										</Fab>
+										<div>
+											<Fab
+												aria-label={intl.formatMessage({
+													id             : 'device.startVideo',
+													defaultMessage : 'Start video'
+												})}
+												className={classes.fab}
+												disabled={!me.canSendWebcam || me.webcamInProgress}
+												color={webcamState === 'on' ? 'default' : 'secondary'}
+												size='large'
+												onClick={() =>
+												{
+													webcamState === 'on' ?
+														roomClient.disableWebcam() :
+														roomClient.enableWebcam();
+												}}
+											>
+												{ webcamState === 'on' ?
+													<VideoIcon />
+													:
+													<VideoOffIcon />
+												}
+											</Fab>
+										</div>
 									}
 								</Tooltip>
 								{ me.browser.platform !== 'mobile' &&
 									<Tooltip title={screenTip} placement='left'>
 										{ smallContainer ?
-											<IconButton
-												aria-label={intl.formatMessage({
-													id             : 'device.startScreenSharing',
-													defaultMessage : 'Start screen sharing'
-												})}
-												className={classes.smallContainer}
-												disabled={
-													!canShareScreen ||
+											<div>
+												<IconButton
+													aria-label={intl.formatMessage({
+														id             : 'device.startScreenSharing',
+														defaultMessage : 'Start screen sharing'
+													})}
+													className={classes.smallContainer}
+													disabled={
+														!canShareScreen ||
 													!me.canShareScreen ||
 													me.screenShareInProgress
-												}
-												color='primary'
-												size='small'
-												onClick={() =>
-												{
-													switch (screenState)
-													{
-														case 'on':
-														{
-															roomClient.disableScreenSharing();
-															break;
-														}
-														case 'off':
-														{
-															roomClient.enableScreenSharing();
-															break;
-														}
-														default:
-														{
-															break;
-														}
 													}
-												}}
-											>
-												{ (screenState === 'on' || screenState === 'unsupported') &&
+													color='primary'
+													size='small'
+													onClick={() =>
+													{
+														switch (screenState)
+														{
+															case 'on':
+															{
+																roomClient.disableScreenSharing();
+																break;
+															}
+															case 'off':
+															{
+																roomClient.enableScreenSharing();
+																break;
+															}
+															default:
+															{
+																break;
+															}
+														}
+													}}
+												>
+													{ (screenState === 'on' || screenState === 'unsupported') &&
 													<ScreenOffIcon/>
-												}
-												{ screenState === 'off' &&
+													}
+													{ screenState === 'off' &&
 													<ScreenIcon/>
-												}
+													}
 
-											</IconButton>
+												</IconButton>
+											</div>
 											:
-											<Fab
-												aria-label={intl.formatMessage({
-													id             : 'device.startScreenSharing',
-													defaultMessage : 'Start screen sharing'
-												})}
-												className={classes.fab}
-												disabled={
-													!canShareScreen ||
+											<div>
+												<Fab
+													aria-label={intl.formatMessage({
+														id             : 'device.startScreenSharing',
+														defaultMessage : 'Start screen sharing'
+													})}
+													className={classes.fab}
+													disabled={
+														!canShareScreen ||
 													!me.canShareScreen ||
 													me.screenShareInProgress
-												}
-												color={screenState === 'on' ? 'primary' : 'default'}
-												size='large'
-												onClick={() =>
-												{
-													switch (screenState)
-													{
-														case 'on':
-														{
-															roomClient.disableScreenSharing();
-															break;
-														}
-														case 'off':
-														{
-															roomClient.enableScreenSharing();
-															break;
-														}
-														default:
-														{
-															break;
-														}
 													}
-												}}
-											>
-												{ (screenState === 'on' || screenState === 'unsupported') &&
+													color={screenState === 'on' ? 'primary' : 'default'}
+													size='large'
+													onClick={() =>
+													{
+														switch (screenState)
+														{
+															case 'on':
+															{
+																roomClient.disableScreenSharing();
+																break;
+															}
+															case 'off':
+															{
+																roomClient.enableScreenSharing();
+																break;
+															}
+															default:
+															{
+																break;
+															}
+														}
+													}}
+												>
+													{ (screenState === 'on' || screenState === 'unsupported') &&
 													<ScreenOffIcon/>
-												}
-												{ screenState === 'off' &&
+													}
+													{ screenState === 'off' &&
 													<ScreenIcon/>
-												}
-											</Fab>
+													}
+												</Fab>
+											</div>
 										}
 									</Tooltip>
 								}
@@ -692,39 +704,43 @@ const Me = (props) =>
 							>
 								<Tooltip title={webcamTip} placement='left'>
 									{ smallContainer ?
-										<IconButton
-											aria-label={intl.formatMessage({
-												id             : 'device.stopVideo',
-												defaultMessage : 'Stop video'
-											})}
-											className={classes.smallContainer}
-											disabled={!me.canSendWebcam || me.webcamInProgress}
-											size='small'
-											color='primary'
-											onClick={() =>
-											{
-												roomClient.disableExtraVideo(producer.id);
-											}}
-										>
-											<VideoIcon />
+										<div>
+											<IconButton
+												aria-label={intl.formatMessage({
+													id             : 'device.stopVideo',
+													defaultMessage : 'Stop video'
+												})}
+												className={classes.smallContainer}
+												disabled={!me.canSendWebcam || me.webcamInProgress}
+												size='small'
+												color='primary'
+												onClick={() =>
+												{
+													roomClient.disableExtraVideo(producer.id);
+												}}
+											>
+												<VideoIcon />
 
-										</IconButton>
+											</IconButton>
+										</div>
 										:
-										<Fab
-											aria-label={intl.formatMessage({
-												id             : 'device.stopVideo',
-												defaultMessage : 'Stop video'
-											})}
-											className={classes.fab}
-											disabled={!me.canSendWebcam || me.webcamInProgress}
-											size={smallContainer ? 'small' : 'large'}
-											onClick={() =>
-											{
-												roomClient.disableExtraVideo(producer.id);
-											}}
-										>
-											<VideoIcon />
-										</Fab>
+										<div>
+											<Fab
+												aria-label={intl.formatMessage({
+													id             : 'device.stopVideo',
+													defaultMessage : 'Stop video'
+												})}
+												className={classes.fab}
+												disabled={!me.canSendWebcam || me.webcamInProgress}
+												size={smallContainer ? 'small' : 'large'}
+												onClick={() =>
+												{
+													roomClient.disableExtraVideo(producer.id);
+												}}
+											>
+												<VideoIcon />
+											</Fab>
+										</div>
 									}
 								</Tooltip>
 							</div>