diff --git a/lib/main.dart b/lib/main.dart
index f49192b..95434d0 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -76,6 +76,9 @@ class _MyAppState extends State<MyApp> {
           darkTheme: DARK_THEME_MATERIAL,
           themeMode: ThemeMode.system,
         ),
+        cupertino: (_, __) => CupertinoAppData(
+          theme: LIGHT_THEME_CUPERTINO,
+        ),
         localizationsDelegates: AppLocalizations.localizationsDelegates,
         supportedLocales: AppLocalizations.supportedLocales,
         routes: {
diff --git a/lib/screens/calendar_screen.dart b/lib/screens/calendar_screen.dart
index 0582307..98d9d0b 100644
--- a/lib/screens/calendar_screen.dart
+++ b/lib/screens/calendar_screen.dart
@@ -44,7 +44,7 @@ class CalendarScreen extends StatelessWidget {
                         : null,
                     trailingActions: calendar.isInSelectMode
                         ? <Widget>[
-                            IconButton(
+                            PlatformIconButton(
                               onPressed: () async {
                                 calendar.setIsSavingToGallery(true);
 
@@ -52,6 +52,7 @@ class CalendarScreen extends StatelessWidget {
                                     calendar.filterMemories(memories.memories);
 
                                 final hasSavedAll = await showPlatformDialog(
+                                  barrierDismissible: true,
                                   context: context,
                                   builder: (_) => SaveToGalleryModal(
                                     memories: memoriesToSave,
diff --git a/lib/screens/calendar_screen/save_to_gallery_modal.dart b/lib/screens/calendar_screen/save_to_gallery_modal.dart
index c98b2c2..6b97e76 100644
--- a/lib/screens/calendar_screen/save_to_gallery_modal.dart
+++ b/lib/screens/calendar_screen/save_to_gallery_modal.dart
@@ -1,3 +1,5 @@
+import 'dart:math';
+
 import 'package:flutter/material.dart';
 import 'package:quid_faciam_hodie/constants/spacing.dart';
 import 'package:quid_faciam_hodie/foreign_types/memory.dart';
@@ -30,11 +32,9 @@ class _SaveToGalleryModalState extends State<SaveToGalleryModal> {
     for (final memory in widget.memories) {
       await memory.saveFileToGallery();
 
-      if (widget.memories.last != memory) {
-        setState(() {
-          currentMemory = currentMemory + 1;
-        });
-      }
+      setState(() {
+        currentMemory = min(widget.memories.length - 1, currentMemory + 1);
+      });
     }
 
     if (mounted) {