diff --git a/public/assets/pages/viewerpage/application_3d.js b/public/assets/pages/viewerpage/application_3d.js
index 760c4e3d..5f749c62 100644
--- a/public/assets/pages/viewerpage/application_3d.js
+++ b/public/assets/pages/viewerpage/application_3d.js
@@ -37,7 +37,7 @@ export default async function(render, { mime, acl$, getDownloadUrl = nop, getFil
 
     const $menubar = renderMenubar(
         qs($page, "component-menubar"),
-        buttonDownload(getFilename(), getDownloadUrl()),
+        buttonDownload(getDownloadUrl()),
     );
     const $draw = qs($page, ".drawarea");
     const $toolbar = qs($page, ".toolbar");
diff --git a/public/assets/pages/viewerpage/application_audio.js b/public/assets/pages/viewerpage/application_audio.js
index b462557b..40bc4028 100644
--- a/public/assets/pages/viewerpage/application_audio.js
+++ b/public/assets/pages/viewerpage/application_audio.js
@@ -56,7 +56,7 @@ export default function(render, { getFilename, getDownloadUrl }) {
         </div>
     `);
     render($page);
-    renderMenubar(qs($page, "component-menubar"), buttonDownload(getFilename(), getDownloadUrl()));
+    renderMenubar(qs($page, "component-menubar"), buttonDownload(getDownloadUrl()));
 
     transition(qs($page, ".audioplayer_box"));
 
diff --git a/public/assets/pages/viewerpage/application_downloader.js b/public/assets/pages/viewerpage/application_downloader.js
index 438912e2..f20e225c 100644
--- a/public/assets/pages/viewerpage/application_downloader.js
+++ b/public/assets/pages/viewerpage/application_downloader.js
@@ -14,7 +14,7 @@ export default async function(render, { acl$, getFilename, getDownloadUrl, hasMe
         <div class="component_filedownloader">
             <component-menubar filename="${safe(getFilename())}" class="${!hasMenubar && "hidden"}"></component-menubar>
             <div class="download_button no-select">
-                <a download="${safe(getFilename())}" href="${safe(getDownloadUrl())}">${t("DOWNLOAD")}</a>
+                <a href="${safe(getDownloadUrl())}">${t("DOWNLOAD")}</a>
                 <component-icon name="loading" class="hidden"></component-icon>
             </div>
         </div>
diff --git a/public/assets/pages/viewerpage/application_ebook.js b/public/assets/pages/viewerpage/application_ebook.js
index b77749a8..92b496cd 100644
--- a/public/assets/pages/viewerpage/application_ebook.js
+++ b/public/assets/pages/viewerpage/application_ebook.js
@@ -16,7 +16,7 @@ export default function(render, { getFilename, getDownloadUrl }) {
         </div>
     `);
     render($page);
-    renderMenubar(qs($page, "component-menubar"), buttonDownload(getFilename(), getDownloadUrl()));
+    renderMenubar(qs($page, "component-menubar"), buttonDownload(getDownloadUrl()));
 
     const rendition$ = new rxjs.ReplaySubject(1);
 
diff --git a/public/assets/pages/viewerpage/application_editor.js b/public/assets/pages/viewerpage/application_editor.js
index ec6dfcd4..f24550dd 100644
--- a/public/assets/pages/viewerpage/application_editor.js
+++ b/public/assets/pages/viewerpage/application_editor.js
@@ -38,7 +38,7 @@ export default async function(render, { acl$, getFilename, getDownloadUrl, mime
         fab: () => qs($page, `[is="component-fab"]`),
     };
     render($page);
-    renderMenubar($dom.menubar(), buttonDownload(getFilename(), getDownloadUrl()));
+    renderMenubar($dom.menubar(), buttonDownload(getDownloadUrl()));
 
     const content$ = new rxjs.ReplaySubject(1);
 
diff --git a/public/assets/pages/viewerpage/application_image.js b/public/assets/pages/viewerpage/application_image.js
index 1227d426..6ee88edf 100644
--- a/public/assets/pages/viewerpage/application_image.js
+++ b/public/assets/pages/viewerpage/application_image.js
@@ -54,7 +54,7 @@ export default function(render, { getFilename, getDownloadUrl, mime, hasMenubar
 
     renderMenubar(
         $menubar,
-        buttonDownload(getFilename(), getDownloadUrl()),
+        buttonDownload(getDownloadUrl()),
         buttonFullscreen(qs($page, ".component_image_container")),
         mime === "image/jpeg" && buttonInfo({ toggle: toggleInfo }),
         ["image/jpeg", "image/png"].indexOf(mime) !== -1 && buttonChromecast(getFilename(), getDownloadUrl()),
diff --git a/public/assets/pages/viewerpage/application_map.js b/public/assets/pages/viewerpage/application_map.js
index 349cf6fc..1630278a 100644
--- a/public/assets/pages/viewerpage/application_map.js
+++ b/public/assets/pages/viewerpage/application_map.js
@@ -24,7 +24,7 @@ export default async function(render, { mime, getDownloadUrl = nop, getFilename
     render($page);
     const $menubar = renderMenubar(
         qs($page, "component-menubar"),
-        buttonDownload(getFilename(), getDownloadUrl()),
+        buttonDownload(getDownloadUrl()),
     );
     const map = window.L.map("map");
     const removeLoader = createLoader(qs($page, "#map"));
diff --git a/public/assets/pages/viewerpage/application_pdf.js b/public/assets/pages/viewerpage/application_pdf.js
index 293ec2c1..7bff9ea1 100644
--- a/public/assets/pages/viewerpage/application_pdf.js
+++ b/public/assets/pages/viewerpage/application_pdf.js
@@ -32,7 +32,7 @@ function ctrlPDFNative(render, { getFilename, getDownloadUrl }) {
         </div>
     `);
     render($page);
-    renderMenubar(qs($page, "component-menubar"), buttonDownload(getFilename(), getDownloadUrl()));
+    renderMenubar(qs($page, "component-menubar"), buttonDownload(getDownloadUrl()));
 
     const removeLoader = createLoader(qs($page, `[data-bind="pdf"]`));
     effect(onLoad(qs($page, "embed")).pipe(
diff --git a/public/assets/pages/viewerpage/application_table.js b/public/assets/pages/viewerpage/application_table.js
index 6a75677e..1d29efa2 100644
--- a/public/assets/pages/viewerpage/application_table.js
+++ b/public/assets/pages/viewerpage/application_table.js
@@ -34,7 +34,7 @@ export default async function(render, { mime, getDownloadUrl, getFilename, hasMe
     render($page);
     const $menubar = renderMenubar(
         qs($page, "component-menubar"),
-        buttonDownload(getFilename(), getDownloadUrl()),
+        buttonDownload(getDownloadUrl()),
     );
     const $dom = {
         thead: qs($page, ".thead"),
diff --git a/public/assets/pages/viewerpage/application_video.js b/public/assets/pages/viewerpage/application_video.js
index c3c425c3..91b73b72 100644
--- a/public/assets/pages/viewerpage/application_video.js
+++ b/public/assets/pages/viewerpage/application_video.js
@@ -66,7 +66,7 @@ export default function(render, { mime, getFilename, getDownloadUrl }) {
     render($page);
     renderMenubar(
         qs($page, "component-menubar"),
-        buttonDownload(getFilename(), getDownloadUrl()),
+        buttonDownload(getDownloadUrl()),
         buttonFullscreen(qs($page, "video")),
     );
     transition(qs($page, ".video_container"));
diff --git a/public/assets/pages/viewerpage/component_menubar.js b/public/assets/pages/viewerpage/component_menubar.js
index 5973ac63..e2373292 100644
--- a/public/assets/pages/viewerpage/component_menubar.js
+++ b/public/assets/pages/viewerpage/component_menubar.js
@@ -54,14 +54,14 @@ export default class ComponentMenubar extends HTMLElement {
     }
 }
 
-export function buttonDownload(name, link) {
+export function buttonDownload(link) {
     const ICON = {
         DOWNLOAD: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzODQgNTEyIj4KICA8cGF0aCBmaWxsPSIjZjJmMmYyIiBkPSJNIDM2MCw0NjAgSCAyNCBDIDEwLjcsNDYwIDAsNDUzLjMgMCw0NDAgdiAtMTIgYyAwLC0xMy4zIDEwLjcsLTIwIDI0LC0yMCBoIDMzNiBjIDEzLjMsMCAyNCw2LjcgMjQsMjAgdiAxMiBjIDAsMTMuMyAtMTAuNywyMCAtMjQsMjAgeiIgLz4KICA8cGF0aCBmaWxsPSIjZjJmMmYyIiBkPSJNIDIyNi41NTM5LDIzNC44ODQyOCBWIDUyLjk0MzI4MyBjIDAsLTYuNjI3IC01LjM3MywtMTIgLTEyLC0xMiBoIC00NCBjIC02LjYyNywwIC0xMiw1LjM3MyAtMTIsMTIgViAyMzQuODg0MjggaCAtNTIuMDU5IGMgLTIxLjM4MiwwIC0zMi4wOSwyNS44NTEgLTE2Ljk3MSw0MC45NzEgbCA4Ni4wNTksODYuMDU5IGMgOS4zNzMsOS4zNzMgMjQuNTY5LDkuMzczIDMzLjk0MSwwIGwgODYuMDU5LC04Ni4wNTkgYyAxNS4xMTksLTE1LjExOSA0LjQxMSwtNDAuOTcxIC0xNi45NzEsLTQwLjk3MSB6IiAvPgo8L3N2Zz4K",
         LOADING: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPHN2ZyB3aWR0aD0nMTIwcHgnIGhlaWdodD0nMTIwcHgnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDEwMCAxMDAiIHByZXNlcnZlQXNwZWN0UmF0aW89InhNaWRZTWlkIiBjbGFzcz0idWlsLXJpbmctYWx0Ij4KICA8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwIiBoZWlnaHQ9IjEwMCIgZmlsbD0ibm9uZSIgY2xhc3M9ImJrIj48L3JlY3Q+CiAgPGNpcmNsZSBjeD0iNTAiIGN5PSI1MCIgcj0iNDAiIHN0cm9rZT0ibm9uZSIgZmlsbD0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIj48L2NpcmNsZT4KICA8Y2lyY2xlIGN4PSI1MCIgY3k9IjUwIiByPSI0MCIgc3Ryb2tlPSIjZmZmZmZmIiBmaWxsPSJub25lIiBzdHJva2Utd2lkdGg9IjYiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCI+CiAgICA8YW5pbWF0ZSBhdHRyaWJ1dGVOYW1lPSJzdHJva2UtZGFzaG9mZnNldCIgZHVyPSIycyIgcmVwZWF0Q291bnQ9ImluZGVmaW5pdGUiIGZyb209IjAiIHRvPSI1MDIiPjwvYW5pbWF0ZT4KICAgIDxhbmltYXRlIGF0dHJpYnV0ZU5hbWU9InN0cm9rZS1kYXNoYXJyYXkiIGR1cj0iMnMiIHJlcGVhdENvdW50PSJpbmRlZmluaXRlIiB2YWx1ZXM9IjE1MC42IDEwMC40OzEgMjUwOzE1MC42IDEwMC40Ij48L2FuaW1hdGU+CiAgPC9jaXJjbGU+Cjwvc3ZnPgo=",
     };
     const $el = createElement(`
         <span class="download-button">
-            <a href="${link}" download="${safe(name)}">
+            <a href="${link}">
                 <img class="component_icon" draggable="false" src="${ICON.DOWNLOAD}" alt="download">
             </a>
         </span>