diff --git a/src/dbp-official-signature-pdf-upload.js b/src/dbp-official-signature-pdf-upload.js
index a8c07ade9e03f2fdddf089681e57deecd308482a..ff20c7041eb596f7b2a12891c9914893f9ed2ba9 100644
--- a/src/dbp-official-signature-pdf-upload.js
+++ b/src/dbp-official-signature-pdf-upload.js
@@ -341,7 +341,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
                             (${humanFileSize(file.size)})
                         </span>
                         <button
-                            class="button close"
+                            class="button close is-icon"
                             ?disabled="${this.signingProcessEnabled}"
                             title="${i18n.t('official-pdf-upload.remove-queued-file-button-title')}"
                             @click="${() => {
@@ -426,7 +426,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
                             (${humanFileSize(file.contentSize)})
                         </span>
                         <button
-                            class="button"
+                            class="button is-icon"
                             title="${i18n.t('official-pdf-upload.download-file-button-title')}"
                             @click="${() => {
                                 this.downloadFileClickHandler(file, 'file-block-' + id);
@@ -467,7 +467,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
                         </span>
                         <div class="buttons">
                             <button
-                                class="button"
+                                class="button is-icon"
                                 title="${i18n.t('official-pdf-upload.re-upload-file-button-title')}"
                                 @click="${() => {
                                     this.fileQueueingClickHandler(data.file, id);
@@ -475,7 +475,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
                                 <dbp-icon name="reload"></dbp-icon>
                             </button>
                             <button
-                                class="button"
+                                class="button is-icon"
                                 title="${i18n.t(
                                     'official-pdf-upload.remove-failed-file-button-title'
                                 )}"
diff --git a/src/dbp-pdf-annotation-view.js b/src/dbp-pdf-annotation-view.js
index 7f9942281e1840afdcb51c450db7bd16a4348b9a..a0559af1feba18455f7e2823354a0b6a98156781 100644
--- a/src/dbp-pdf-annotation-view.js
+++ b/src/dbp-pdf-annotation-view.js
@@ -383,7 +383,7 @@ export class PdfAnnotationView extends ScopedElementsMixin(DBPLitElement) {
                     <div class="inner-grid">
                         <label><strong>${name}</strong></label>
                         <button
-                            class="button close"
+                            class="button close is-icon"
                             title="${i18n.t('annotation-view.remove-field')}"
                             @click="${() => {
                                 this.removeAnnotation(id);
diff --git a/src/dbp-pdf-preview.js b/src/dbp-pdf-preview.js
index 306b49e6439e6b15878477386e3fd5fbf915dfd4..04eee0e97b9610db10a7b89df6a877fd25f099dc 100644
--- a/src/dbp-pdf-preview.js
+++ b/src/dbp-pdf-preview.js
@@ -666,7 +666,7 @@ export class PdfPreview extends ScopedElementsMixin(DBPLitElement) {
                             </button>
                             <div class="nav-buttons">
                                 <button
-                                    class="button"
+                                    class="button is-icon"
                                     title="${i18n.t('pdf-preview.first-page')}"
                                     @click="${async () => {
                                         await this.showPage(1);
@@ -676,7 +676,7 @@ export class PdfPreview extends ScopedElementsMixin(DBPLitElement) {
                                     <dbp-icon name="angle-double-left"></dbp-icon>
                                 </button>
                                 <button
-                                    class="button"
+                                    class="button is-icon"
                                     title="${i18n.t('pdf-preview.previous-page')}"
                                     @click="${async () => {
                                         if (this.currentPage > 1)
@@ -698,7 +698,7 @@ export class PdfPreview extends ScopedElementsMixin(DBPLitElement) {
                                     })}
                                 </div>
                                 <button
-                                    class="button"
+                                    class="button is-icon"
                                     title="${i18n.t('pdf-preview.next-page')}"
                                     @click="${async () => {
                                         if (this.currentPage < this.totalPages)
@@ -709,7 +709,7 @@ export class PdfPreview extends ScopedElementsMixin(DBPLitElement) {
                                     <dbp-icon name="chevron-right"></dbp-icon>
                                 </button>
                                 <button
-                                    class="button"
+                                    class="button is-icon"
                                     title="${i18n.t('pdf-preview.last-page')}"
                                     @click="${async () => {
                                         await this.showPage(this.totalPages);
diff --git a/src/dbp-qualified-signature-pdf-upload.js b/src/dbp-qualified-signature-pdf-upload.js
index 739c41d1564213370c35882b113ef2471822f7ed..410442c81762605e2b10418f6e76f2cb214c0e34 100644
--- a/src/dbp-qualified-signature-pdf-upload.js
+++ b/src/dbp-qualified-signature-pdf-upload.js
@@ -472,7 +472,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
                             (${humanFileSize(file.size)})
                         </span>
                         <button
-                            class="button close"
+                            class="button close is-icon"
                             ?disabled="${this.signingProcessEnabled}"
                             title="${i18n.t(
                                 'qualified-pdf-upload.remove-queued-file-button-title'
@@ -559,7 +559,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
                             (${humanFileSize(file.contentSize)})
                         </span>
                         <button
-                            class="button"
+                            class="button is-icon"
                             title="${i18n.t('qualified-pdf-upload.download-file-button-title')}"
                             @click="${() => {
                                 this.downloadFileClickHandler(file, 'file-block-' + id);
@@ -600,7 +600,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
                         </span>
                         <div class="buttons">
                             <button
-                                class="button"
+                                class="button is-icon"
                                 title="${i18n.t(
                                     'qualified-pdf-upload.re-upload-file-button-title'
                                 )}"
@@ -610,7 +610,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
                                 <dbp-icon name="reload"></dbp-icon>
                             </button>
                             <button
-                                class="button"
+                                class="button is-icon"
                                 title="${i18n.t(
                                     'qualified-pdf-upload.remove-failed-file-button-title'
                                 )}"
diff --git a/src/styles.js b/src/styles.js
index 19add420e6dfb5e4ed563a274fcece9cd396271f..01bc493ca21e9cd22eaefb05016b317d9f904e86 100644
--- a/src/styles.js
+++ b/src/styles.js
@@ -140,16 +140,20 @@ export function getSignatureCss() {
         }
 
         .file-block {
-            max-width: 320px;
+            width: 320px;
             margin-bottom: 10px;
         }
 
         .file-block .header {
-            display: grid;
+            display: flex;
             align-items: center;
-            grid-template-columns: auto 40px;
+            justify-content: space-between;
             grid-gap: 10px;
         }
+        
+        .file-block .header button{
+            flex-shrink: 0;
+        }
 
         .file-block.error .header {
             grid-template-columns: auto 80px;
@@ -301,7 +305,7 @@ export function getSignatureCss() {
             }
 
             .file-block {
-                max-width: inherit;
+                width: inherit;
             }
 
             #pdf-preview,