diff --git a/projects/ucap-webmessenger-ui/src/lib/components/file-viewer/image-viewer.component.html b/projects/ucap-webmessenger-ui/src/lib/components/file-viewer/image-viewer.component.html
index bf8fa4b5..405b8922 100644
--- a/projects/ucap-webmessenger-ui/src/lib/components/file-viewer/image-viewer.component.html
+++ b/projects/ucap-webmessenger-ui/src/lib/components/file-viewer/image-viewer.component.html
@@ -31,7 +31,6 @@
     <span class="ucap-image-viewer-spacer"></span>
 
     <button
-      *ngIf="!imageOnly"
       mat-icon-button
       class="ucap-image-viewer-action"
       matTooltip="{{ 'common.messages.zoomReset' | translate }}"
@@ -58,7 +57,6 @@
       </svg>
     </button>
     <button
-      *ngIf="!imageOnly"
       mat-icon-button
       class="ucap-image-viewer-action"
       matTooltip="{{ 'common.messages.zoomOut' | translate }}"
@@ -84,7 +82,6 @@
       </svg>
     </button>
     <button
-      *ngIf="!imageOnly"
       mat-icon-button
       class="ucap-image-viewer-action"
       matTooltip="{{ 'common.messages.zoomIn' | translate }}"
@@ -110,61 +107,6 @@
         <line x1="8" y1="11" x2="14" y2="11"></line>
       </svg>
     </button>
-    <!--
-    <button
-      *ngIf="!imageOnly"
-      mat-icon-button
-      class="ucap-image-viewer-action"
-      matTooltip="{{ 'common.file.download' | translate }}"
-      matTooltipPosition="below"
-      aria-label=""
-      (click)="onClickDownload()"
-    >
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        width="21"
-        height="21"
-        viewBox="0 0 24 24"
-        fill="none"
-        stroke="currentColor"
-        stroke-width="2"
-        stroke-linecap="butt"
-        stroke-linejoin="round"
-      >
-        <path
-          d="M3 15v4c0 1.1.9 2 2 2h14a2 2 0 0 0 2-2v-4M17 9l-5 5-5-5M12 12.8V2.5"
-        />
-      </svg>
-    </button>
-  -->
-    <!--
-    <button
-      *ngIf="!imageOnly"
-      mat-icon-button
-      class="ucap-image-viewer-action"
-      matTooltip="{{ 'common.file.saveAs' | translate }}"
-      matTooltipPosition="below"
-      aria-label=""
-      (click)="onClickSaveAs()"
-    >
-
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        width="21"
-        height="21"
-        viewBox="0 0 24 24"
-        fill="none"
-        stroke="currentColor"
-        stroke-width="2"
-        stroke-linecap="butt"
-        stroke-linejoin="round"
-      >
-        <path
-          d="M3 15v4c0 1.1.9 2 2 2h14a2 2 0 0 0 2-2v-4M17 9l-5 5-5-5M12 12.8V2.5"
-        />
-      </svg>
-    </button>
-  -->
 
     <button
       *ngIf="!imageOnly"
@@ -266,11 +208,15 @@
       <ng-template #imageOnlyImg>
         <img
           ucapImage
+          #downloadImage
           [base]="imageOnlyData.imageRootUrl"
           [path]="imageOnlyData.imageUrl"
           [default]="imageOnlyData.defaultImage"
-          style="cursor: pointer; width: auto;"
+          style="cursor: pointer;"
+          [style.width]="'auto'"
+          [style.height]="imageHeight + 'px'"
           (click)="onClickClose()"
+          (load)="onLoadFileDownloadUrl(downloadImage)"
         />
       </ng-template>
       <ng-template #defaultImg>