Styling and lint

app/src/components/Controls/TopBar.js

@@ -81,6 +81,10 @@ const styles = (theme) =>
 			margin  : theme.spacing(1, 0),
 			padding : theme.spacing(0, 1)
 		},
+		disabledButton :
+		{
+			margin : theme.spacing(1, 0)
+		},
 		green :
 		{
 			color : 'rgba(0, 153, 0, 1)'
@@ -270,6 +274,7 @@ const TopBar = (props) =>
 						</IconButton>
 					</Tooltip>
 					<Tooltip title={lockTooltip}>
+						<span className={classes.disabledButton}>
 							<IconButton
 								aria-label={intl.formatMessage({
 									id             : 'tooltip.lockRoom',
@@ -296,6 +301,7 @@ const TopBar = (props) =>
 									<LockOpenIcon />
 								}
 							</IconButton>
+						</span>
 					</Tooltip>
 					{ lobbyPeers.length > 0 &&
 						<Tooltip 
@@ -304,11 +310,13 @@ const TopBar = (props) =>
 								defaultMessage : 'Show lobby'
 							})}
 						>
+							<span className={classes.disabledButton}>
 								<IconButton
 									aria-label={intl.formatMessage({
 										id             : 'tooltip.lobby',
 										defaultMessage : 'Show lobby'
 									})}
+									className={classes.actionButton}
 									color='inherit'
 									disabled={!canPromote}
 									onClick={() => setLockDialogOpen(!room.lockDialogOpen)}
@@ -320,6 +328,7 @@ const TopBar = (props) =>
 										<SecurityIcon />
 									</PulsingBadge>
 								</IconButton>
+							</span>
 						</Tooltip>
 					}
 					{ loginEnabled &&
@@ -339,7 +348,7 @@ const TopBar = (props) =>
 								{ myPicture ?
 									<Avatar src={myPicture} />
 									:
-									<AccountCircle className={loggedIn && classes.green} />
+									<AccountCircle className={loggedIn ? classes.green : null} />
 								}
 							</IconButton>
 						</Tooltip>

app/src/components/JoinDialog.js

@@ -149,7 +149,7 @@ const DialogTitle = withStyles(styles)((props) =>
 							<Avatar src={myPicture} className={classes.largeAvatar} />
 							:
 							<AccountCircle
-								className={classnames(classes.largeIcon, loggedIn && classes.green)}
+								className={classnames(classes.largeIcon, loggedIn ? classes.green : null)}
 							/>
 						}
 					</IconButton>