diff --git a/res/css/views/messages/_MessageActionBar.scss b/res/css/views/messages/_MessageActionBar.scss
index 975fe24899..69f3c672b7 100644
--- a/res/css/views/messages/_MessageActionBar.scss
+++ b/res/css/views/messages/_MessageActionBar.scss
@@ -109,7 +109,7 @@ limitations under the License.
 }
 
 .mx_MessageActionBar_downloadButton::after {
-    mask-size: 16px;
+    mask-size: 14px;
     mask-image: url('$(res)/img/download.svg');
 }
 
diff --git a/src/components/views/messages/DownloadActionButton.tsx b/src/components/views/messages/DownloadActionButton.tsx
index 35413975b6..eb25e50d83 100644
--- a/src/components/views/messages/DownloadActionButton.tsx
+++ b/src/components/views/messages/DownloadActionButton.tsx
@@ -93,7 +93,7 @@ export class DownloadActionButton extends React.PureComponent<IProps, IState> {
 
         return <RovingAccessibleTooltipButton
             className={classes}
-            title={_t("Download")}
+            title={spinner ? _t("Downloading") : _t("Download")}
             onClick={this.onDownloadClick}
             disabled={!!spinner}
         >
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ed137cdf6c..8f00e70d97 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1870,6 +1870,7 @@
     "Saturday": "Saturday",
     "Today": "Today",
     "Yesterday": "Yesterday",
+    "Downloading": "Downloading",
     "Download": "Download",
     "View Source": "View Source",
     "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.",