diff --git a/frontend/app/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.ts b/frontend/app/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.ts
index 607707fa..b4d3445c 100644
--- a/frontend/app/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.ts
+++ b/frontend/app/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.ts
@@ -48,6 +48,7 @@ export class InfoPanelLightboxComponent {
 
   getTime() {
     const date = new Date(this.photo.metadata.creationDate);
+    //TODO: pad with zeros
     return date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
   }
 
diff --git a/frontend/app/gallery/map/lightbox/lightbox.map.gallery.component.html b/frontend/app/gallery/map/lightbox/lightbox.map.gallery.component.html
index 4a654ea2..9ba3900d 100644
--- a/frontend/app/gallery/map/lightbox/lightbox.map.gallery.component.html
+++ b/frontend/app/gallery/map/lightbox/lightbox.map.gallery.component.html
@@ -18,6 +18,11 @@
                     [latitude]="photo.latitude"
                     [longitude]="photo.longitude"
                     [iconUrl]="photo.iconUrl">
+              <agm-info-window>
+                <img [style.width.px]="photo.preview.width"
+                     [style.height.px]="photo.preview.height"
+                     [src]="photo.preview.url">
+              </agm-info-window>
             </agm-marker>
         </agm-map>
     </div>
diff --git a/frontend/app/gallery/map/lightbox/lightbox.map.gallery.component.ts b/frontend/app/gallery/map/lightbox/lightbox.map.gallery.component.ts
index b9089f04..0b99d4eb 100644
--- a/frontend/app/gallery/map/lightbox/lightbox.map.gallery.component.ts
+++ b/frontend/app/gallery/map/lightbox/lightbox.map.gallery.component.ts
@@ -5,6 +5,7 @@ import {FullScreenService} from "../../fullscreen.service";
 import {AgmMap} from "@agm/core";
 import {IconThumbnail, ThumbnailManagerService} from "../../thumnailManager.service";
 import {IconPhoto} from "../../IconPhoto";
+import {Photo} from "../../Photo";
 
 @Component({
   selector: 'gallery-map-lightbox',
@@ -19,7 +20,7 @@ export class GalleryMapLightboxComponent implements OnChanges {
   public mapDimension: Dimension = <Dimension>{top: 0, left: 0, width: 0, height: 0};
   public visible = false;
   public opacity = 1.0;
-  mapPhotos: Array<{ latitude: number, longitude: number, iconUrl?: string, thumbnail: IconThumbnail }> = [];
+  mapPhotos: MapPhoto[] = [];
   mapCenter = {latitude: 0, longitude: 0};
 
   @ViewChild("root") elementRef: ElementRef;
@@ -94,18 +95,30 @@ export class GalleryMapLightboxComponent implements OnChanges {
     this.mapPhotos = this.photos.filter(p => {
       return p.metadata && p.metadata.positionData && p.metadata.positionData.GPSData;
     }).map(p => {
-      let th = this.thumbnailService.getIcon(new IconPhoto(p));
-      let obj: { latitude: number, longitude: number, iconUrl?: string, thumbnail: IconThumbnail } = {
+      let width = 500;
+      let height = 500;
+      if (p.metadata.size.width > p.metadata.size.height) {
+        height = width * (p.metadata.size.height / p.metadata.size.width);
+      } else {
+        width = height * (p.metadata.size.width / p.metadata.size.height);
+      }
+      const iconTh = this.thumbnailService.getIcon(new IconPhoto(p));
+      const obj: MapPhoto = {
         latitude: p.metadata.positionData.GPSData.latitude,
         longitude: p.metadata.positionData.GPSData.longitude,
-        thumbnail: th
+        iconThumbnail: iconTh,
+        preview: {
+          width: width,
+          height: height,
+          url: (new Photo(p, width, height)).getThumbnailPath()
+        }
 
       };
-      if (th.Available == true) {
-        obj.iconUrl = th.Src;
+      if (iconTh.Available == true) {
+        obj.iconUrl = iconTh.Src;
       } else {
-        th.OnLoad = () => {
-          obj.iconUrl = th.Src;
+        iconTh.OnLoad = () => {
+          obj.iconUrl = iconTh.Src;
         };
       }
       return obj;
@@ -117,7 +130,7 @@ export class GalleryMapLightboxComponent implements OnChanges {
   }
 
   hideImages() {
-    this.mapPhotos.forEach(mp => mp.thumbnail.destroy());
+    this.mapPhotos.forEach((mp) => mp.iconThumbnail.destroy());
     this.mapPhotos = [];
   }
 
@@ -155,3 +168,15 @@ export class GalleryMapLightboxComponent implements OnChanges {
 
 }
 
+export interface MapPhoto {
+  latitude: number;
+  longitude: number;
+  iconUrl?: string;
+  iconThumbnail: IconThumbnail;
+  preview: {
+    width: number;
+    height: number;
+    url: string;
+  }
+}
+
diff --git a/frontend/app/model/network/network.service.ts b/frontend/app/model/network/network.service.ts
index e00ff055..9fdddad9 100644
--- a/frontend/app/model/network/network.service.ts
+++ b/frontend/app/model/network/network.service.ts
@@ -21,6 +21,7 @@ export class NetworkService {
     let headers = new Headers({'Content-Type': 'application/json'});
     let options = new RequestOptions({headers: headers});
 
+    //TODO handle long loading time
     this.slimLoadingBarService.visible = true;
     this.slimLoadingBarService.start(() => {
       this.slimLoadingBarService.visible = false;