diff --git a/lib/photo_sync_manager.dart b/lib/photo_sync_manager.dart
index 8f5a78b6f..c93a408be 100644
--- a/lib/photo_sync_manager.dart
+++ b/lib/photo_sync_manager.dart
@@ -116,8 +116,7 @@ class PhotoSyncManager {
             .download(_endpoint + photo.url, localPath)
             .catchError(_onError);
         photo.localPath = localPath;
-        // TODO: Fix me
-        photo.thumbnailPath = localPath;
+        Photo.setThumbnail(photo);
         await DatabaseHelper.instance.insertPhoto(photo);
         PhotoLoader.instance.reloadPhotos();
       }
diff --git a/lib/thumbnail_generator.dart b/lib/thumbnail_generator.dart
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/ui/gallery.dart b/lib/ui/gallery.dart
index ec963cfab..aa1b1a95c 100644
--- a/lib/ui/gallery.dart
+++ b/lib/ui/gallery.dart
@@ -1,5 +1,3 @@
-import 'dart:io';
-
 import 'package:flutter/material.dart';
 import 'package:logger/logger.dart';
 import 'package:myapp/models/photo.dart';
diff --git a/lib/ui/image_widget.dart b/lib/ui/image_widget.dart
index 4b3ff22a0..fd324a84f 100644
--- a/lib/ui/image_widget.dart
+++ b/lib/ui/image_widget.dart
@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:logger/logger.dart';
 import 'package:myapp/core/lru_map.dart';
 import 'package:myapp/photo_loader.dart';
 import 'package:myapp/ui/loading_widget.dart';
@@ -19,7 +18,6 @@ class ImageWidget extends StatefulWidget {
 }
 
 class _ImageWidgetState extends State<ImageWidget> {
-  var _logger = Logger();
   PhotoLoader get photoLoader => Provider.of<PhotoLoader>(context);
 
   @override