diff --git a/assets/dbp-signature.html.ejs b/assets/dbp-signature.html.ejs
index 17bc5e6891d683568e506df6330e60ae9ec8663e..efebee0600b15b430bbb5c77a478db72d0b3c09e 100644
--- a/assets/dbp-signature.html.ejs
+++ b/assets/dbp-signature.html.ejs
@@ -49,7 +49,7 @@
             --dbp-override-warning-bg-color: #ffe183;
             --dbp-override-warning-text-color: black;
             --dbp-override-success-bg-color: #259207;
-            --dbp-override-downloaded-bg-color: #9fdf9f;
+ /*           --dbp-override-downloaded-bg-color: #9fdf9f; */
         }
     </style>
 
diff --git a/src/dbp-official-signature-pdf-upload.js b/src/dbp-official-signature-pdf-upload.js
index e6176262c31294b783fdb4350dcb775b17a49a63..bd8e5fea2b470816c7b8763d0ce53b16e0a25f5c 100644
--- a/src/dbp-official-signature-pdf-upload.js
+++ b/src/dbp-official-signature-pdf-upload.js
@@ -600,8 +600,8 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
                 white-space: nowrap;
             }
 
-            .downloaded {
-                background: var(--dbp-downloaded-bg-color);
+            .button.downloaded {
+                background-color: var(--dbp-downloaded-bg-color);
             }
 
             #pdf-preview .button.is-cancel {
@@ -773,12 +773,12 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
             const file = this.signedFiles[id];
 
             results.push(html`
-                <div class="file-block" id="file-block-${id}">
+                <div class="file-block">
                     <div class="header">
                         <span class="filename"><strong>${file.name}</strong> (${humanFileSize(file.contentSize)})</span>
-                        <button class="button close"
+                        <button class="button is-primary" id="file-download-button-${id}"
                             title="${i18n.t('official-pdf-upload.download-file-button-title')}"
-                            @click="${() => { this.downloadFileClickHandler(file, 'file-block-' + id); }}">
+                            @click="${() => { this.downloadFileClickHandler(file, 'file-download-button-' + id); }}">
                             <dbp-icon name="download"></dbp-icon></button>
                     </div>
                 </div>
diff --git a/src/dbp-qualified-signature-pdf-upload.js b/src/dbp-qualified-signature-pdf-upload.js
index 721ad29da6ac1a03b0ba5f3e6102cb7e3018ccda..a6b2caa2f82f312326dd7bcb15c0438b0bb60489 100644
--- a/src/dbp-qualified-signature-pdf-upload.js
+++ b/src/dbp-qualified-signature-pdf-upload.js
@@ -707,7 +707,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
             }
 
             .downloaded {
-                background: var(--dbp-downloaded-bg-color);
+                background-color: var(--dbp-downloaded-bg-color);
             }
 
             #pdf-preview .button.is-cancel {
@@ -896,12 +896,12 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
             const file = this.signedFiles[id];
 
             results.push(html`
-                <div class="file-block" id="file-block-${id}">
+                <div class="file-block">
                     <div class="header">
                         <span class="filename"><strong>${file.name}</strong> (${humanFileSize(file.contentSize)})</span>
-                        <button class="button close"
+                        <button class="button is-primary" id="file-download-button-${id}"
                             title="${i18n.t('qualified-pdf-upload.download-file-button-title')}"
-                            @click="${() => { this.downloadFileClickHandler(file, 'file-block-' + id); }}">
+                            @click="${() => { this.downloadFileClickHandler(file, 'file-download-button-' + id); }}">
                             <dbp-icon name="download"></dbp-icon></button>
                     </div>
                 </div>
diff --git a/src/dbp-signature-lit-element.js b/src/dbp-signature-lit-element.js
index ab5c1308e06c3a6463d546f9251b80656d48cfa6..86911388b526c1457a1f505a1aa45111c264b44c 100644
--- a/src/dbp-signature-lit-element.js
+++ b/src/dbp-signature-lit-element.js
@@ -388,6 +388,12 @@ export default class DBPSignatureLitElement extends BaseLitElement {
         this.signedFilesToDownload = files.length;
         this._("#file-sink").files = files;
         this._("#zip-download-button").stop();
+        // mark downloaded files buttons
+        const buttons = this.shadowRoot.querySelectorAll('.file-block > div > button');
+        buttons.forEach(button => {
+            button.classList.add('downloaded');
+            button.classList.remove('is-primary');
+        });
     }
 
     /**
@@ -410,7 +416,9 @@ export default class DBPSignatureLitElement extends BaseLitElement {
         files.push(binaryFile);
         this.signedFilesToDownload = files.length;
         this._("#file-sink").files = files;
-        const div = this.shadowRoot.querySelector('#' + id);
-        div.classList.add('downloaded');
+        // mark downloaded files button
+        const button = this.shadowRoot.querySelector('#' + id);
+        button.classList.add('downloaded');
+        button.classList.remove('is-primary');
     }
 }