diff --git a/shared/components/Preview/PreviewFrame.jsx b/shared/components/Preview/PreviewFrame.jsx
index 3bf8e90c..b0d2b21a 100644
--- a/shared/components/Preview/PreviewFrame.jsx
+++ b/shared/components/Preview/PreviewFrame.jsx
@@ -46,6 +46,10 @@ class PreviewFrame extends React.Component {
 				this.clearPreview();
 			}
 		}
+
+		if (this.props.isPlaying && this.props.content != prevProps.content) {
+			this.renderSketch();
+		}
 	}
 
 	componentWillUnmount() {
diff --git a/styles/components/_toolbar.scss b/styles/components/_toolbar.scss
index 2503cda9..f2f1775e 100644
--- a/styles/components/_toolbar.scss
+++ b/styles/components/_toolbar.scss
@@ -1,6 +1,12 @@
 .toolbar__play-button {
 	@extend %toolbar-button;
 	margin-right: #{15 / $base-font-size}rem;
+	&.playing {
+		background-color: $light-button-background-hover-color;
+		& g {
+			fill: $light-button-hover-color;
+		}
+	}
 }
 
 .toolbar__stop-button {