diff --git a/app/lib/components/ToolArea/ToolAreaButton.jsx b/app/lib/components/ToolArea/ToolAreaButton.jsx
index 6659dcd..43139a7 100644
--- a/app/lib/components/ToolArea/ToolAreaButton.jsx
+++ b/app/lib/components/ToolArea/ToolAreaButton.jsx
@@ -11,15 +11,21 @@ class ToolAreaButton extends React.Component
 		const {
 			toolAreaOpen,
 			toggleToolArea,
-			unread
+			unread,
+			visible
 		} = this.props;
 
 		return (
-			<div data-component='ToolAreaButton' className={classnames({ on: toolAreaOpen })}>
+			<div
+				data-component='ToolAreaButton'
+				className={classnames('room-controls', {
+					on : toolAreaOpen,
+					visible
+				})}
+			>
 				<div
-					className={classnames('button toolarea-button room-controls', {
-						on      : toolAreaOpen,
-						visible : this.props.visible
+					className={classnames('button toolarea-button', {
+						on : toolAreaOpen
 					})}
 					data-tip='Toggle tool area'
 					data-type='dark'
diff --git a/app/stylus/components/ToolArea.styl b/app/stylus/components/ToolArea.styl
index 030df6a..8aed834 100644
--- a/app/stylus/components/ToolArea.styl
+++ b/app/stylus/components/ToolArea.styl
@@ -83,7 +83,7 @@
 	right: 0;
 	height: 36px;
 	width: 36px;
-	padding: 2rem;
+	margin: 2rem;
 	display: flex;
 	flex-direction: column;
 	justify-content: center;