diff --git a/package-lock.json b/package-lock.json
index 88dad711f3e7cae2b0b89cbae19888308d3a9ad1..3ac3ea8d37d79011012d6b1d322ed90f2fdbcc60 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11228,9 +11228,9 @@
       }
     },
     "scratch-blocks": {
-      "version": "0.1.0-prerelease.1563990552",
-      "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.1563990552.tgz",
-      "integrity": "sha512-7V6PuufNXdJajpn1bIrB+MABN6bggdAJy5ejhaGFuw4TaUPS7khRWuFGx569Iljt03C+2lzRPIK66cUQ1NpdPg==",
+      "version": "0.1.0-prerelease.1564581595",
+      "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.1564581595.tgz",
+      "integrity": "sha512-ixktjoum1irVuZ+W31wZCdm4IbTbe4/hY+aQqnfznGivaclDWF5dzdClT3ec+x23/bDupBvIjH6+zmIJWbS/Gg==",
       "dev": true,
       "requires": {
         "exports-loader": "0.6.3",
diff --git a/package.json b/package.json
index e70444feabd6174762aa28732056866eab7a59a3..ed0e07edc76b669b0387ea172dd9465bdd67048e 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "rimraf": "^2.6.1",
     "scratch-audio": "0.1.0-prerelease.20190114210212",
     "scratch-l10n": "3.5.20190724160319",
-    "scratch-blocks": "0.1.0-prerelease.1563990552",
+    "scratch-blocks": "0.1.0-prerelease.1564581595",
     "scratch-paint": "0.2.0-prerelease.20190729153946",
     "scratch-render": "0.1.0-prerelease.20190605151415",
     "scratch-storage": "1.3.2",
diff --git a/src/components/sound-editor/icon--fade-in.svg b/src/components/sound-editor/icon--fade-in.svg
index 6c74875843c26da7cc06d2d179ca6805ce8c2a9b..351f5915a26371581918630b4fe85f596880cf1a 100644
Binary files a/src/components/sound-editor/icon--fade-in.svg and b/src/components/sound-editor/icon--fade-in.svg differ
diff --git a/src/components/sound-editor/icon--fade-out.svg b/src/components/sound-editor/icon--fade-out.svg
index 96e8d624463241a310a4e92352afca077a59dbf4..08f3da05676d35e350ab8c190d3f4beed1072061 100644
Binary files a/src/components/sound-editor/icon--fade-out.svg and b/src/components/sound-editor/icon--fade-out.svg differ
diff --git a/src/containers/audio-selector.jsx b/src/containers/audio-selector.jsx
index 2d5974d5ce8cd69ee2dd7a2ed8e9c592b94955e6..5af1f4e9c211aa5fd9e046f493e9f8c249f70c53 100644
--- a/src/containers/audio-selector.jsx
+++ b/src/containers/audio-selector.jsx
@@ -43,7 +43,8 @@ class AudioSelector extends React.Component {
         });
     }
     componentWillReceiveProps (newProps) {
-        if (newProps.trimStart === this.props.trimStart) return;
+        const {trimStart, trimEnd} = this.props;
+        if (newProps.trimStart === trimStart && newProps.trimEnd === trimEnd) return;
         this.setState({
             trimStart: newProps.trimStart,
             trimEnd: newProps.trimEnd
diff --git a/src/containers/audio-trimmer.jsx b/src/containers/audio-trimmer.jsx
index 78bd4ebac14f68d5ab6b13408a4b589758134be4..b8591eabb54514434920c03d550a68f98c9b16e8 100644
--- a/src/containers/audio-trimmer.jsx
+++ b/src/containers/audio-trimmer.jsx
@@ -42,11 +42,15 @@ class AudioTrimmer extends React.Component {
         this.containerSize = this.containerElement.getBoundingClientRect().width;
         this.trimStartDragRecognizer.start(e);
         this.initialTrim = this.props.trimStart;
+        e.stopPropagation();
+        e.preventDefault();
     }
     handleTrimEndMouseDown (e) {
         this.containerSize = this.containerElement.getBoundingClientRect().width;
         this.trimEndDragRecognizer.start(e);
         this.initialTrim = this.props.trimEnd;
+        e.stopPropagation();
+        e.preventDefault();
     }
     storeRef (el) {
         this.containerElement = el;