diff --git a/package-lock.json b/package-lock.json
index 88dad711f..3ac3ea8d3 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 e70444fea..ed0e07edc 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 6c7487584..351f5915a 100644
--- a/src/components/sound-editor/icon--fade-in.svg
+++ b/src/components/sound-editor/icon--fade-in.svg
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.1 (81669) - https://sketch.com -->
+    <!-- Generator: Sketch 56.2 (81672) - https://sketch.com -->
     <title>Sound/Effects/Fade-in</title>
     <desc>Created with Sketch.</desc>
     <g id="Sound/Effects/Fade-in" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Secondary" opacity="0.25" transform="translate(1.250000, 0.250000)" fill="#CF63CF" fill-rule="nonzero">
-            <path d="M17,0.750486449 L17,18.7504864 C17,18.9652762 16.7470196,19.0800706 16.5853738,18.9386306 C11.2946517,14.3092487 6.01748075,12.0004864 0.75,12.0004864 C0.611928813,12.0004864 0.5,11.8885576 0.5,11.7504864 L0.5,7.75048645 C0.5,7.61241526 0.611928813,7.50048645 0.75,7.50048645 C6.01748075,7.50048645 11.2946517,5.19172416 16.5853738,0.562342275 C16.7470196,0.420902266 17,0.535696746 17,0.750486449 Z" id="Fade"></path>
-        </g>
-        <g id="Primary" transform="translate(1.000000, 1.000000)" fill="#CF63CF" fill-rule="nonzero">
-            <path d="M6.00000018,9.25 L1,9.25 C0.861928813,9.25 0.75,9.13807119 0.75,9 C0.75,8.86192881 0.861928813,8.75 1,8.75 L6,8.75 C6.35324851,8.75 6.58270077,8.50876428 6.90437981,7.88536107 L7.04612021,7.6082292 C7.35582235,7.01071273 7.58718112,6.75 8,6.75 C8.3879427,6.75 8.64783618,6.89521764 9.05675678,7.24762061 L9.1299543,7.31093199 C9.51052276,7.64016497 9.70585257,7.75 10,7.75 C10.1999644,7.75 10.402585,7.39321162 10.7655628,6.41317141 C11.2359183,5.14321162 11.4592237,4.75 12,4.75 C12.4020616,4.75 12.6314717,4.8897049 12.9133418,5.21140451 C12.9679067,5.27426342 12.9973758,5.30824799 13.0201857,5.33390904 C13.2852046,5.63205537 13.5123572,5.75 14,5.75 C14.3765436,5.75 14.6926018,5.13162529 15.2628292,3.42094306 C15.9426018,1.38162529 16.2654325,0.75 17,0.75 C17.1380712,0.75 17.25,0.861928813 17.25,1 L17.25,17 C17.25,17.1380712 17.1380712,17.25 17,17.25 C16.2654325,17.25 15.9426018,16.6183747 15.2628292,14.5790569 C14.6926018,12.8683747 14.3765436,12.25 14,12.25 C13.5123572,12.25 13.2852046,12.3679446 13.0201857,12.666091 C12.9973758,12.691752 12.9679067,12.7257366 12.9133418,12.7885955 C12.6314717,13.1102951 12.4020616,13.25 12,13.25 C11.4592237,13.25 11.2359183,12.8567884 10.7655628,11.5868286 C10.402585,10.6067884 10.1999644,10.25 10,10.25 C9.70585257,10.25 9.51052276,10.359835 9.1299543,10.689068 L9.05675678,10.7523794 C8.64783618,11.1047824 8.3879427,11.25 8,11.25 C7.58718112,11.25 7.35582235,10.9892873 7.04612021,10.3917708 L6.90437981,10.1146389 C6.58270078,9.49123572 6.35324851,9.25 6.00000001,9.25 L6.00000018,9.25 Z" id="Path"></path>
-        </g>
+        <path d="M2,10.25 C1.86192881,10.25 1.75,10.1380712 1.75,10 C1.75,9.86192881 1.86192881,9.75 2,9.75 L7,9.75 C7.35324851,9.75 7.58270077,9.50876428 7.90437981,8.88536107 L8.04612021,8.6082292 C8.35582235,8.01071273 8.58718112,7.75 9,7.75 C9.3879427,7.75 9.64783618,7.89521764 10.0567568,8.24762061 L10.1299543,8.31093199 C10.5105228,8.64016497 10.7058526,8.75 11,8.75 C11.1999644,8.75 11.402585,8.39321162 11.7655628,7.41317141 C12.2359183,6.14321162 12.4592237,5.75 13,5.75 C13.4020616,5.75 13.6314717,5.8897049 13.9133418,6.21140451 C13.9679067,6.27426342 13.9973758,6.30824799 14.0201857,6.33390904 C14.2852046,6.63205537 14.5123572,6.75 15,6.75 C15.3765436,6.75 15.6926018,6.13162529 16.2628292,4.42094306 C16.9426018,2.38162529 17.2654325,1.75 18,1.75 C18.1380712,1.75 18.25,1.86192881 18.25,2 L18.25,18 C18.25,18.1380712 18.1380712,18.25 18,18.25 C17.2654325,18.25 16.9426018,17.6183747 16.2628292,15.5790569 C15.6926018,13.8683747 15.3765436,13.25 15,13.25 C14.5123572,13.25 14.2852046,13.3679446 14.0201857,13.666091 C13.9973758,13.691752 13.9679067,13.7257366 13.9133418,13.7885955 C13.6314717,14.1102951 13.4020616,14.25 13,14.25 C12.4592237,14.25 12.2359183,13.8567884 11.7655628,12.5868286 C11.402585,11.6067884 11.1999644,11.25 11,11.25 C10.7058526,11.25 10.5105228,11.359835 10.1299543,11.689068 L10.0567568,11.7523794 C9.64783618,12.1047824 9.3879427,12.25 9,12.25 C8.58718112,12.25 8.35582235,11.9892873 8.04612021,11.3917708 L7.90437981,11.1146389 C7.58270078,10.4912357 7.35324851,10.25 7.00000001,10.25 L2,10.25 Z" id="Path" fill="#CF63CF" fill-rule="nonzero"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/src/components/sound-editor/icon--fade-out.svg b/src/components/sound-editor/icon--fade-out.svg
index 96e8d6244..08f3da056 100644
--- a/src/components/sound-editor/icon--fade-out.svg
+++ b/src/components/sound-editor/icon--fade-out.svg
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.1 (81669) - https://sketch.com -->
+    <!-- Generator: Sketch 56.2 (81672) - https://sketch.com -->
     <title>Sound/Effects/Fade-out</title>
     <desc>Created with Sketch.</desc>
     <g id="Sound/Effects/Fade-out" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Secondary" opacity="0.25" transform="translate(1.000000, 0.000000)" fill="#CF63CF" fill-rule="nonzero">
-            <path d="M0.75,1.00048645 C0.75,0.785696746 1.00298043,0.670902266 1.16462615,0.812342275 C6.45534831,5.44172416 11.7325193,7.75048645 17,7.75048645 C17.1380712,7.75048645 17.25,7.86241526 17.25,8.00048645 L17.25,12.0004864 C17.25,12.1385576 17.1380712,12.2504864 17,12.2504864 C11.7325193,12.2504864 6.45534831,14.5592487 1.16462615,19.1886306 C1.00298043,19.3300706 0.75,19.2152762 0.75,19.0004864 L0.75,1.00048645 Z" id="Fade"></path>
-        </g>
-        <g id="Primary" transform="translate(1.750000, 1.750000)" fill="#CF63CF" fill-rule="nonzero">
-            <path d="M11.25,8.5 C10.8967515,8.5 10.6672992,8.74123572 10.3456202,9.36463893 L10.2038798,9.6417708 C9.89417765,10.2392873 9.66281888,10.5 9.25,10.5 C8.8620573,10.5 8.60216382,10.3547824 8.19324322,10.0023794 L8.1200457,9.93906801 C7.73947724,9.60983503 7.54414743,9.5 7.25,9.5 C7.05003561,9.5 6.84741505,9.85678838 6.48443719,10.8368286 C6.01408171,12.1067884 5.79077635,12.5 5.25,12.5 C4.84793845,12.5 4.6185283,12.3602951 4.33665816,12.0385955 C4.28209329,11.9757366 4.25262416,11.941752 4.22981434,11.916091 C3.96479538,11.6179446 3.73764275,11.5 3.25,11.5 C2.87345642,11.5 2.55739824,12.1183747 1.98717082,13.8290569 C1.30739824,15.8683747 0.984567531,16.5 0.25,16.5 C0.111928813,16.5 0,16.3880712 0,16.25 L0,0.25 C0,0.111928813 0.111928813,0 0.25,0 C0.984567531,0 1.30739824,0.631625291 1.98717082,2.67094306 C2.55739824,4.38162529 2.87345642,5 3.25,5 C3.73764275,5 3.96479538,4.88205537 4.22981434,4.58390904 C4.25262416,4.55824799 4.28209329,4.52426342 4.33665816,4.46140451 C4.6185283,4.1397049 4.84793845,4 5.25,4 C5.79077635,4 6.01408171,4.39321162 6.48443719,5.66317141 C6.84741505,6.64321162 7.05003561,7 7.25,7 C7.54414743,7 7.73947724,6.89016497 8.1200457,6.56093199 L8.19324322,6.49762061 C8.60216382,6.14521764 8.8620573,6 9.25,6 C9.66281888,6 9.89417765,6.26071273 10.2038798,6.8582292 L10.3456202,7.13536107 C10.6672992,7.75876428 10.8967515,8 11.25,8 L16.25,8 C16.3880712,8 16.5,8.11192881 16.5,8.25 C16.5,8.38807119 16.3880712,8.5 16.25,8.5 L11.2499998,8.5 Z" id="Wave-Form"></path>
-        </g>
+        <path d="M13,10.25 C12.6467515,10.25 12.4172992,10.4912357 12.0956202,11.1146389 L11.9538798,11.3917708 C11.6441776,11.9892873 11.4128189,12.25 11,12.25 C10.6120573,12.25 10.3521638,12.1047824 9.94324322,11.7523794 L9.8700457,11.689068 C9.48947724,11.359835 9.29414743,11.25 9,11.25 C8.80003561,11.25 8.59741505,11.6067884 8.23443719,12.5868286 C7.76408171,13.8567884 7.54077635,14.25 7,14.25 C6.59793845,14.25 6.3685283,14.1102951 6.08665816,13.7885955 C6.03209329,13.7257366 6.00262416,13.691752 5.97981434,13.666091 C5.71479538,13.3679446 5.48764275,13.25 5,13.25 C4.62345642,13.25 4.30739824,13.8683747 3.73717082,15.5790569 C3.05739824,17.6183747 2.73456753,18.25 2,18.25 C1.86192881,18.25 1.75,18.1380712 1.75,18 L1.75,2 C1.75,1.86192881 1.86192881,1.75 2,1.75 C2.73456753,1.75 3.05739824,2.38162529 3.73717082,4.42094306 C4.30739824,6.13162529 4.62345642,6.75 5,6.75 C5.48764275,6.75 5.71479538,6.63205537 5.97981434,6.33390904 C6.00262416,6.30824799 6.03209329,6.27426342 6.08665816,6.21140451 C6.3685283,5.8897049 6.59793845,5.75 7,5.75 C7.54077635,5.75 7.76408171,6.14321162 8.23443719,7.41317141 C8.59741505,8.39321162 8.80003561,8.75 9,8.75 C9.29414743,8.75 9.48947724,8.64016497 9.8700457,8.31093199 L9.94324322,8.24762061 C10.3521638,7.89521764 10.6120573,7.75 11,7.75 C11.4128189,7.75 11.6441776,8.01071273 11.9538798,8.6082292 L12.0956202,8.88536107 C12.4172992,9.50876428 12.6467515,9.75 13,9.75 L18,9.75 C18.1380712,9.75 18.25,9.86192881 18.25,10 C18.25,10.1380712 18.1380712,10.25 18,10.25 L12.9999998,10.25 L13,10.25 Z" id="Path" fill="#CF63CF" fill-rule="nonzero"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/src/containers/audio-selector.jsx b/src/containers/audio-selector.jsx
index 2d5974d5c..5af1f4e9c 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 78bd4ebac..b8591eabb 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;