diff --git a/lib/model/image_metadata.dart b/lib/model/image_metadata.dart
index 57f98a0eb..9471d0ec0 100644
--- a/lib/model/image_metadata.dart
+++ b/lib/model/image_metadata.dart
@@ -48,7 +48,7 @@ class CatalogMetadata {
     this.xmpTitleDescription,
     double latitude,
     double longitude,
-  })
+  })  
   // Geocoder throws an IllegalArgumentException when a coordinate has a funky values like 1.7056881853375E7
   : latitude = latitude == null || latitude < -90.0 || latitude > 90.0 ? null : latitude,
         longitude = longitude == null || longitude < -180.0 || longitude > 180.0 ? null : longitude;
diff --git a/lib/widgets/common/scaling.dart b/lib/widgets/common/scaling.dart
index c5bb1603c..9f1cc5cb1 100644
--- a/lib/widgets/common/scaling.dart
+++ b/lib/widgets/common/scaling.dart
@@ -92,6 +92,7 @@ class _GridScaleGestureDetectorState<T> extends State<GridScaleGestureDetector<T
             builder: (extent) => widget.scaledBuilder(_metadata.item, extent),
             center: thumbnailCenter,
             gridWidth: gridWidth,
+            spacing: tileExtentManager.spacing,
             scaledExtentNotifier: _scaledExtentNotifier,
             showScaledGrid: widget.showScaledGrid,
           ),
@@ -157,6 +158,7 @@ class ScaleOverlay extends StatefulWidget {
   final Widget Function(double extent) builder;
   final Offset center;
   final double gridWidth;
+  final double spacing;
   final ValueNotifier<double> scaledExtentNotifier;
   final bool showScaledGrid;
 
@@ -164,6 +166,7 @@ class ScaleOverlay extends StatefulWidget {
     @required this.builder,
     @required this.center,
     @required this.gridWidth,
+    @required this.spacing,
     @required this.scaledExtentNotifier,
     @required this.showScaledGrid,
   });
@@ -243,6 +246,7 @@ class _ScaleOverlayState extends State<ScaleOverlay> {
                   painter: GridPainter(
                     center: clampedCenter,
                     extent: extent,
+                    spacing: widget.spacing,
                   ),
                   child: child,
                 );
@@ -258,11 +262,12 @@ class _ScaleOverlayState extends State<ScaleOverlay> {
 
 class GridPainter extends CustomPainter {
   final Offset center;
-  final double extent;
+  final double extent, spacing;
 
   const GridPainter({
     @required this.center,
     @required this.extent,
+    @required this.spacing,
   });
 
   @override
@@ -271,7 +276,7 @@ class GridPainter extends CustomPainter {
       ..strokeWidth = DecoratedThumbnail.borderWidth
       ..shader = ui.Gradient.radial(
         center,
-        size.width / 2,
+        size.width * .7,
         [
           DecoratedThumbnail.borderColor,
           Colors.transparent,
@@ -281,10 +286,18 @@ class GridPainter extends CustomPainter {
           1,
         ],
       );
+    void draw(Offset topLeft) {
+      for (var i = -2; i <= 3; i++) {
+        final ref = (extent + spacing) * i;
+        canvas.drawLine(Offset(0, topLeft.dy + ref), Offset(size.width, topLeft.dy + ref), paint);
+        canvas.drawLine(Offset(topLeft.dx + ref, 0), Offset(topLeft.dx + ref, size.height), paint);
+      }
+    }
+
     final topLeft = center.translate(-extent / 2, -extent / 2);
-    for (var i = -1; i <= 2; i++) {
-      canvas.drawLine(Offset(0, topLeft.dy + extent * i), Offset(size.width, topLeft.dy + extent * i), paint);
-      canvas.drawLine(Offset(topLeft.dx + extent * i, 0), Offset(topLeft.dx + extent * i, size.height), paint);
+    draw(topLeft);
+    if (spacing > 0) {
+      draw(topLeft.translate(-spacing, -spacing));
     }
   }
 
diff --git a/lib/widgets/filter_grids/common/decorated_filter_chip.dart b/lib/widgets/filter_grids/common/decorated_filter_chip.dart
index c2aa2d52f..f971fb46b 100644
--- a/lib/widgets/filter_grids/common/decorated_filter_chip.dart
+++ b/lib/widgets/filter_grids/common/decorated_filter_chip.dart
@@ -66,7 +66,7 @@ class DecoratedFilterChip extends StatelessWidget {
   Widget _buildDetails(CollectionFilter filter) {
     final padding = min<double>(8.0, extent / 16);
     final iconSize = min<double>(14.0, extent / 8);
-    final fontSize = min<double>(14.0, (extent / 6).roundToDouble());
+    final fontSize = min<double>(14.0, extent / 6);
     return Row(
       mainAxisSize: MainAxisSize.min,
       children: [
@@ -84,13 +84,13 @@ class DecoratedFilterChip extends StatelessWidget {
         if (filter is AlbumFilter && androidFileUtils.isOnRemovableStorage(filter.album))
           AnimatedPadding(
             padding: EdgeInsets.only(right: padding),
+            duration: Durations.chipDecorationAnimation,
             child: DecoratedIcon(
               AIcons.removableStorage,
               color: FilterGridPage.detailColor,
               shadows: [Constants.embossShadow],
               size: iconSize,
             ),
-            duration: Durations.chipDecorationAnimation,
           ),
         Text(
           '${source.count(filter)}',
diff --git a/lib/widgets/filter_grids/common/filter_grid_page.dart b/lib/widgets/filter_grids/common/filter_grid_page.dart
index 6240c3a39..b9536b4db 100644
--- a/lib/widgets/filter_grids/common/filter_grid_page.dart
+++ b/lib/widgets/filter_grids/common/filter_grid_page.dart
@@ -95,7 +95,7 @@ class FilterGridPage<T extends CollectionFilter> extends StatelessWidget {
                           scrollableKey: _scrollableKey,
                           appBarHeightNotifier: _appBarHeightNotifier,
                           viewportSize: viewportSize,
-                          showScaledGrid: false,
+                          showScaledGrid: true,
                           scaledBuilder: (item, extent) {
                             final filter = item.filter;
                             return SizedBox(