diff --git a/app/javascript/mastodon/components/icon_button.js b/app/javascript/mastodon/components/icon_button.js
index 651b89566b..76b0da12fe 100644
--- a/app/javascript/mastodon/components/icon_button.js
+++ b/app/javascript/mastodon/components/icon_button.js
@@ -90,11 +90,11 @@ export default class IconButton extends React.PureComponent {
       damping: 7,
     };
     const motionStyle = {
-      rotate: this.props.animate ? spring(rotateDeg, springOpts) : 0,
+      rotate: animate ? spring(rotateDeg, springOpts) : 0,
     };
 
     return (
-      <Motion defaultStyle={{ rotate: active ? -360 : 0 }} style={{ rotate: animate ? spring(active ? -360 : 0, { stiffness: 120, damping: 7 }) : 0 }}>
+      <Motion defaultStyle={motionDefaultStyle} style={motionStyle}>
         {({ rotate }) =>
           <button
             aria-label={title}
diff --git a/app/javascript/packs/common.js b/app/javascript/packs/common.js
index cb47514d35..5ac6504d47 100644
--- a/app/javascript/packs/common.js
+++ b/app/javascript/packs/common.js
@@ -3,6 +3,7 @@ import 'font-awesome/css/font-awesome.css';
 
 // import common styling
 require('../styles/common.scss');
+
 require.context('../images/', true);
 
 start();