diff --git a/lib/image_grid.dart b/lib/image_grid.dart
index db0950d..922dadf 100644
--- a/lib/image_grid.dart
+++ b/lib/image_grid.dart
@@ -107,9 +107,7 @@ class _ImageGridState extends State<ImageGrid> {
           }
         }
 
-        return const CircularProgressIndicator(
-          strokeWidth: 3,
-        );
+        return const Center(child: CircularProgressIndicator());
       },
     );
   }
diff --git a/lib/image_tile.dart b/lib/image_tile.dart
index 5bf557f..5738bc7 100644
--- a/lib/image_tile.dart
+++ b/lib/image_tile.dart
@@ -14,37 +14,51 @@ class ImageTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
-      onTap: () {
-        onClick?.call();
-      },
-      child: Container(
+        onTap: () {
+          onClick?.call();
+        },
+        child: Container(
           padding: const EdgeInsets.all(3),
-          child: Container(
-              decoration: imageUri == null
-                  ? BoxDecoration(
+          child: imageUri == null
+              ? Container(
+                  decoration: BoxDecoration(
                       color: Colors.white,
                       borderRadius: BorderRadius.all(
                           Radius.circular(calcTileMaxWidth() / 30)),
                       boxShadow: [
-                          BoxShadow(
-                              color: Colors.black12,
-                              spreadRadius: calcTileMaxWidth() / 150,
-                              blurRadius: calcTileMaxWidth() / 60),
-                        ])
-                  : BoxDecoration(
-                      image: DecorationImage(
-                        fit: BoxFit.cover,
-                        image: dtaProvider!.getImageProvider(imageUri!),
-                      ),
+                        BoxShadow(
+                            color: Colors.black12,
+                            spreadRadius: calcTileMaxWidth() / 150,
+                            blurRadius: calcTileMaxWidth() / 60),
+                      ]),
+                  child: child)
+              : Container(
+                  decoration: BoxDecoration(
                       borderRadius: BorderRadius.all(
                           Radius.circular(calcTileMaxWidth() / 30)),
                       boxShadow: [
-                          BoxShadow(
-                              color: Colors.black12,
-                              spreadRadius: calcTileMaxWidth() / 150,
-                              blurRadius: calcTileMaxWidth() / 60),
-                        ]),
-              child: child)),
-    );
+                        BoxShadow(
+                            color: Colors.black12,
+                            spreadRadius: calcTileMaxWidth() / 150,
+                            blurRadius: calcTileMaxWidth() / 60),
+                      ]),
+                  child: ClipRRect(
+                      borderRadius: BorderRadius.all(
+                        Radius.circular(calcTileMaxWidth() / 30),
+                      ),
+                      child: Image(
+                        fit: BoxFit.cover,
+                        frameBuilder:
+                            (context, child, frame, wasSynchronouslyLoaded) {
+                          return frame == null
+                              ? const Center(
+                                  child: CircularProgressIndicator(),
+                                )
+                              : child;
+                        },
+                        image: dtaProvider!.getImageProvider(imageUri!),
+                      )),
+                ),
+        ));
   }
 }
diff --git a/lib/main.dart b/lib/main.dart
index 89ea439..603f16d 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -23,6 +23,7 @@ class AppScrollBehavior extends MaterialScrollBehavior {
   Set<PointerDeviceKind> get dragDevices => {
         PointerDeviceKind.touch,
         PointerDeviceKind.mouse,
+        PointerDeviceKind.trackpad
       };
 }