diff --git a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-widget-select.component.html b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-widget-select.component.html
index a32dc812cd..5bb677e814 100644
--- a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-widget-select.component.html
+++ b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-widget-select.component.html
@@ -27,7 +27,7 @@
   <ng-template #widgets let-fetchFunction="fetchFunction" let-filter="filter">
     <tb-scroll-grid
       [columns]="columns"
-      [itemSize]="160"
+      [itemSize]="gridWidgetsItemSizeStrategy"
       [fetchFunction]="fetchFunction"
       [filter]="filter"
       [itemCard]="widgetCard"
@@ -74,7 +74,7 @@
   <ng-template #bundles>
     <tb-scroll-grid
       [columns]="columns"
-      [itemSize]="160"
+      [itemSize]="gridWidgetsItemSizeStrategy"
       [fetchFunction]="widgetBundlesFetchFunction"
       [filter]="widgetsBundleFilter"
       [itemCard]="widgetsBundleCard"
diff --git a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-widget-select.component.ts b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-widget-select.component.ts
index ff9afe6920..50cf1ac790 100644
--- a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-widget-select.component.ts
+++ b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-widget-select.component.ts
@@ -32,6 +32,7 @@ import { isObject } from '@core/utils';
 import { PageLink } from '@shared/models/page/page-link';
 import { Direction } from '@shared/models/page/sort-order';
 import { GridEntitiesFetchFunction, ScrollGridColumns } from '@home/models/datasource/scroll-grid-datasource';
+import { ItemSizeStrategy } from '@home/components/grid/scroll-grid.component';
 
 type selectWidgetMode = 'bundles' | 'allWidgets';
 
@@ -148,6 +149,11 @@ export class DashboardWidgetSelectComponent implements OnInit {
     }
   };
 
+  gridWidgetsItemSizeStrategy: ItemSizeStrategy = {
+    defaultItemSize: 160,
+    itemSizeFunction: itemWidth => (itemWidth - 24) * 0.8 + 76
+  };
+
   widgetBundlesFetchFunction: GridEntitiesFetchFunction<WidgetsBundle, string>;
   allWidgetsFetchFunction: GridEntitiesFetchFunction<WidgetTypeInfo, WidgetsFilter>;
   widgetsFetchFunction: GridEntitiesFetchFunction<WidgetTypeInfo, BundleWidgetsFilter>;
diff --git a/ui-ngx/src/app/modules/home/components/grid/scroll-grid.component.html b/ui-ngx/src/app/modules/home/components/grid/scroll-grid.component.html
index 5d6c066c94..43b877d295 100644
--- a/ui-ngx/src/app/modules/home/components/grid/scroll-grid.component.html
+++ b/ui-ngx/src/app/modules/home/components/grid/scroll-grid.component.html
@@ -15,7 +15,8 @@
     limitations under the License.
 
 -->
-<cdk-virtual-scroll-viewport #viewport class="tb-scroll-grid-viewport" [itemSize]="itemSize" appendOnly>
+<cdk-virtual-scroll-viewport #viewport class="tb-scroll-grid-viewport" [itemSize]="calculatedItemSize"
+                             [minBufferPx]="minBuffer" [maxBufferPx]="maxBuffer" appendOnly>
   <ng-container *cdkVirtualFor="let itemsRow of dataSource; let row = index; trackBy: trackByItemsRow">
     <div *ngIf="itemsRow" class="tb-scroll-grid-items-row" [style]="{gap: gap+'px'}">
       <div *ngFor="let item of itemsRow; let col = index; trackBy: trackByItem" class="tb-scroll-grid-item-container">
diff --git a/ui-ngx/src/app/modules/home/components/grid/scroll-grid.component.ts b/ui-ngx/src/app/modules/home/components/grid/scroll-grid.component.ts
index dcced7b3c0..cf9f9f4cd3 100644
--- a/ui-ngx/src/app/modules/home/components/grid/scroll-grid.component.ts
+++ b/ui-ngx/src/app/modules/home/components/grid/scroll-grid.component.ts
@@ -15,10 +15,10 @@
 ///
 
 import {
-  AfterViewInit,
+  AfterViewInit, ChangeDetectorRef,
   Component,
   Input,
-  OnChanges,
+  OnChanges, OnDestroy,
   OnInit,
   Renderer2,
   SimpleChanges,
@@ -34,6 +34,14 @@ import {
 import { BreakpointObserver } from '@angular/cdk/layout';
 import { isObject } from '@app/core/utils';
 import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling';
+import { ResizeObserver } from '@juggle/resize-observer';
+
+export type ItemSizeFunction = (itemWidth: number) => number;
+
+export interface ItemSizeStrategy {
+  defaultItemSize: number;
+  itemSizeFunction: ItemSizeFunction;
+}
 
 @Component({
   selector: 'tb-scroll-grid',
@@ -41,7 +49,7 @@ import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling';
   styleUrls: ['./scroll-grid.component.scss'],
   encapsulation: ViewEncapsulation.None
 })
-export class ScrollGridComponent<T, F> implements OnInit, AfterViewInit, OnChanges {
+export class ScrollGridComponent<T, F> implements OnInit, AfterViewInit, OnChanges, OnDestroy {
 
   @ViewChild('viewport')
   viewport: CdkVirtualScrollViewport;
@@ -56,7 +64,7 @@ export class ScrollGridComponent<T, F> implements OnInit, AfterViewInit, OnChang
   filter: F;
 
   @Input()
-  itemSize = 200;
+  itemSize: number | ItemSizeStrategy = 200;
 
   @Input()
   gap = 12;
@@ -75,17 +83,37 @@ export class ScrollGridComponent<T, F> implements OnInit, AfterViewInit, OnChang
 
   dataSource: ScrollGridDatasource<T, F>;
 
+  calculatedItemSize: number;
+  minBuffer: number;
+  maxBuffer: number;
+
+  private contentResize$: ResizeObserver;
+
   constructor(private breakpointObserver: BreakpointObserver,
+              private cd: ChangeDetectorRef,
               private renderer: Renderer2) {
   }
 
   ngOnInit(): void {
+    if (typeof this.itemSize === 'number') {
+      this.calculatedItemSize = this.itemSize;
+    } else {
+      this.calculatedItemSize = this.itemSize.defaultItemSize;
+    }
+    this.minBuffer = this.calculatedItemSize;
+    this.maxBuffer = this.calculatedItemSize * 2;
     this.dataSource = new ScrollGridDatasource<T, F>(this.breakpointObserver, this.columns, this.fetchFunction, this.filter);
   }
 
   ngAfterViewInit() {
     this.renderer.setStyle(this.viewport._contentWrapper.nativeElement, 'gap', this.gap + 'px');
     this.renderer.setStyle(this.viewport._contentWrapper.nativeElement, 'padding', this.gap + 'px');
+    if (!(typeof this.itemSize === 'number')) {
+      this.contentResize$ = new ResizeObserver(() => {
+        this.onContentResize();
+      });
+      this.contentResize$.observe(this.viewport._contentWrapper.nativeElement);
+    }
   }
 
   ngOnChanges(changes: SimpleChanges): void {
@@ -97,6 +125,12 @@ export class ScrollGridComponent<T, F> implements OnInit, AfterViewInit, OnChang
     }
   }
 
+  ngOnDestroy() {
+    if (this.contentResize$) {
+      this.contentResize$.disconnect();
+    }
+  }
+
   isObject(value: any): boolean {
     return isObject(value);
   }
@@ -120,4 +154,14 @@ export class ScrollGridComponent<T, F> implements OnInit, AfterViewInit, OnChang
   public deleteItem(index: number) {
     this.dataSource.deleteItem(index);
   }
+
+  private onContentResize() {
+    const contentWidth = this.viewport._contentWrapper.nativeElement.getBoundingClientRect().width;
+    const columns = this.dataSource.currentColumns;
+    const itemWidth = (contentWidth - this.gap * (columns + 1)) / columns;
+    this.calculatedItemSize = (this.itemSize as ItemSizeStrategy).itemSizeFunction(itemWidth);
+    this.minBuffer = this.calculatedItemSize;
+    this.maxBuffer = this.calculatedItemSize * 2;
+    this.cd.markForCheck();
+  }
 }
diff --git a/ui-ngx/src/app/modules/home/components/image/image-gallery.component.html b/ui-ngx/src/app/modules/home/components/image/image-gallery.component.html
index 1f071790be..bae808aaaf 100644
--- a/ui-ngx/src/app/modules/home/components/image/image-gallery.component.html
+++ b/ui-ngx/src/app/modules/home/components/image/image-gallery.component.html
@@ -260,7 +260,7 @@
     <div fxFlex class="mat-padding" *ngIf="mode === 'grid'" fxLayout="column">
       <tb-scroll-grid fxFlex
         [columns]="gridColumns"
-        [itemSize]="150"
+        [itemSize]="gridImagesItemSizeStrategy"
         [fetchFunction]="gridImagesFetchFunction"
         [filter]="gridImagesFilter"
         [itemCard]="imageCard"
@@ -339,5 +339,11 @@
   </div>
 </ng-template>
 <ng-template #imageLoadingCard>
-  <div> TODO </div>
+  <div class="tb-image-card tb-primary-fill loading-cell">
+    <div class="tb-image-preview-container">
+      <div class="tb-image-preview-spacer"></div>
+      <div class="tb-image-preview"></div>
+    </div>
+    <div class="tb-image-details"></div>
+  </div>
 </ng-template>
diff --git a/ui-ngx/src/app/modules/home/components/image/image-gallery.component.scss b/ui-ngx/src/app/modules/home/components/image/image-gallery.component.scss
index 0fe15f8e3e..0216445bee 100644
--- a/ui-ngx/src/app/modules/home/components/image/image-gallery.component.scss
+++ b/ui-ngx/src/app/modules/home/components/image/image-gallery.component.scss
@@ -153,6 +153,7 @@ $tb-button-selected-color: rgb(255, 110, 64) !default;
       }
 
       .tb-image-details {
+        min-height: 52px;
         flex: 1;
         display: flex;
         flex-direction: column;
@@ -205,6 +206,14 @@ $tb-button-selected-color: rgb(255, 110, 64) !default;
           }
         }
       }
+      &.loading-cell {
+        .tb-image-preview-container, .tb-image-details {
+          background: linear-gradient(110deg, #ececec 8%, #f5f5f5 18%, #ececec 33%);
+          border-radius: 5px;
+          background-size: 200% 100%;
+          animation: 1s shine linear infinite;
+        }
+      }
     }
 
     .table-container {
@@ -229,3 +238,9 @@ $tb-button-selected-color: rgb(255, 110, 64) !default;
     }
   }
 }
+
+@keyframes shine {
+  to {
+    background-position-x: -200%;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/image/image-gallery.component.ts b/ui-ngx/src/app/modules/home/components/image/image-gallery.component.ts
index 7e8cae6719..4d28f0f810 100644
--- a/ui-ngx/src/app/modules/home/components/image/image-gallery.component.ts
+++ b/ui-ngx/src/app/modules/home/components/image/image-gallery.component.ts
@@ -51,7 +51,7 @@ import { NULL_UUID } from '@shared/models/id/has-uuid';
 import { getCurrentAuthUser } from '@core/auth/auth.selectors';
 import { Authority } from '@shared/models/authority.enum';
 import { GridEntitiesFetchFunction, ScrollGridColumns } from '@home/models/datasource/scroll-grid-datasource';
-import { ScrollGridComponent } from '@home/components/grid/scroll-grid.component';
+import { ItemSizeStrategy, ScrollGridComponent } from '@home/components/grid/scroll-grid.component';
 import { MatDialog } from '@angular/material/dialog';
 import {
   UploadImageDialogComponent,
@@ -112,6 +112,11 @@ export class ImageGalleryComponent extends PageComponent implements OnInit, OnDe
   gridImagesFetchFunction: GridEntitiesFetchFunction<ImageResourceInfo, string>;
   gridImagesFilter = '';
 
+  gridImagesItemSizeStrategy: ItemSizeStrategy = {
+    defaultItemSize: 200,
+    itemSizeFunction: itemWidth => itemWidth + 72
+  };
+
   authUser = getCurrentAuthUser(this.store);
 
   private updateDataSubscription: Subscription;
diff --git a/ui-ngx/src/app/shared/components/image-input.component.html b/ui-ngx/src/app/shared/components/image-input.component.html
index 039611bbf3..96f674a745 100644
--- a/ui-ngx/src/app/shared/components/image-input.component.html
+++ b/ui-ngx/src/app/shared/components/image-input.component.html
@@ -64,7 +64,7 @@
   </div>
   </ng-container>
   <div *ngIf="(showFileName && fileName) || (maxSizeByte && !disabled)" class="tb-image-info-container">
-    <div *ngIf="showFileName && fileName" class="tb-image-file-name">{{ fileName }}</div>
+    <div *ngIf="showFileName && fileName" class="tb-image-file-name" [title]="fileName">{{ fileName }}</div>
     <div *ngIf="maxSizeByte && !disabled" class="tb-image-file-hint" translate [translateParams]="{ size: maxSizeByte | fileSize}">dashboard.maximum-upload-file-size</div>
   </div>
 </div>