diff --git a/analysis_options.yaml b/analysis_options.yaml
index 478e34228..ac0f1ead1 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -30,6 +30,7 @@ analyzer:
   errors:
     avoid_empty_else: error
     exhaustive_cases: error
+    unused_import: warning
     use_rethrow_when_possible: info
 
     prefer_const_constructors: ignore # too many warnings
diff --git a/lib/ui/gallery_app_bar_widget.dart b/lib/ui/gallery_app_bar_widget.dart
index a7b915d80..05b136e7f 100644
--- a/lib/ui/gallery_app_bar_widget.dart
+++ b/lib/ui/gallery_app_bar_widget.dart
@@ -9,7 +9,6 @@ import 'package:photos/core/event_bus.dart';
 import 'package:photos/events/subscription_purchased_event.dart';
 import 'package:photos/models/collection.dart';
 import 'package:photos/models/selected_files.dart';
-import 'package:photos/services/billing_service.dart';
 import 'package:photos/services/collections_service.dart';
 import 'package:photos/ui/create_collection_page.dart';
 import 'package:photos/ui/share_collection_widget.dart';
diff --git a/lib/ui/password_entry_page.dart b/lib/ui/password_entry_page.dart
index 1e609c148..c96ab0478 100644
--- a/lib/ui/password_entry_page.dart
+++ b/lib/ui/password_entry_page.dart
@@ -13,7 +13,6 @@ import 'package:photos/services/user_service.dart';
 import 'package:photos/ui/common_elements.dart';
 import 'package:photos/ui/payment/subscription.dart';
 import 'package:photos/ui/recovery_key_dialog.dart';
-import 'package:photos/ui/payment/subscription_page.dart';
 import 'package:photos/ui/web_page.dart';
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/toast_util.dart';
diff --git a/lib/ui/payment/payment_web_page.dart b/lib/ui/payment/payment_web_page.dart
index 8f0c65822..30339212f 100644
--- a/lib/ui/payment/payment_web_page.dart
+++ b/lib/ui/payment/payment_web_page.dart
@@ -9,7 +9,6 @@ import 'package:photos/models/subscription.dart';
 import 'package:photos/services/billing_service.dart';
 import 'package:photos/services/user_service.dart';
 import 'package:photos/utils/dialog_util.dart';
-import 'package:photos/utils/toast_util.dart';
 
 import '../loading_widget.dart';
 import '../progress_dialog.dart';
diff --git a/lib/ui/recovery_page.dart b/lib/ui/recovery_page.dart
index 6059d13b9..19332fe7c 100644
--- a/lib/ui/recovery_page.dart
+++ b/lib/ui/recovery_page.dart
@@ -1,7 +1,6 @@
 import 'dart:ui';
 
 import 'package:flutter/material.dart';
-import 'package:logging/logging.dart';
 import 'package:photos/core/configuration.dart';
 import 'package:photos/ui/common_elements.dart';
 import 'package:photos/ui/password_entry_page.dart';
diff --git a/lib/ui/settings/account_section_widget.dart b/lib/ui/settings/account_section_widget.dart
index f9dcfaa20..5646cca3c 100644
--- a/lib/ui/settings/account_section_widget.dart
+++ b/lib/ui/settings/account_section_widget.dart
@@ -12,7 +12,6 @@ import 'package:photos/ui/payment/subscription.dart';
 import 'package:photos/ui/recovery_key_dialog.dart';
 import 'package:photos/ui/settings/settings_section_title.dart';
 import 'package:photos/ui/settings/settings_text_item.dart';
-import 'package:photos/ui/payment/subscription_page.dart';
 import 'package:photos/utils/auth_util.dart';
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/toast_util.dart';
diff --git a/lib/ui/sync_indicator.dart b/lib/ui/sync_indicator.dart
index 2292ed7f0..9e07bfc54 100644
--- a/lib/ui/sync_indicator.dart
+++ b/lib/ui/sync_indicator.dart
@@ -7,7 +7,6 @@ import 'package:photos/events/sync_status_update_event.dart';
 import 'package:photos/services/sync_service.dart';
 import 'package:photos/ui/common_elements.dart';
 import 'package:photos/ui/payment/subscription.dart';
-import 'package:photos/ui/payment/subscription_page.dart';
 import 'package:photos/utils/email_util.dart';
 
 class SyncIndicator extends StatefulWidget {
diff --git a/lib/ui/two_factor_setup_page.dart b/lib/ui/two_factor_setup_page.dart
index d1d58246e..af3f4c79f 100644
--- a/lib/ui/two_factor_setup_page.dart
+++ b/lib/ui/two_factor_setup_page.dart
@@ -4,7 +4,6 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_sodium/flutter_sodium.dart';
-import 'package:logging/logging.dart';
 import 'package:photos/core/configuration.dart';
 import 'package:photos/services/user_service.dart';
 import 'package:photos/ui/common_elements.dart';
diff --git a/lib/ui/zoomable_image.dart b/lib/ui/zoomable_image.dart
index d63c03d8e..e19d3e76d 100644
--- a/lib/ui/zoomable_image.dart
+++ b/lib/ui/zoomable_image.dart
@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:logging/logging.dart';
 import 'package:photo_view/photo_view.dart';
-import 'package:photos/core/cache/image_cache.dart';
 import 'package:photos/core/cache/thumbnail_cache.dart';
 import 'package:photos/core/constants.dart';
 import 'package:photos/core/event_bus.dart';
diff --git a/lib/utils/email_util.dart b/lib/utils/email_util.dart
index c5420a4ee..8bc5b1216 100644
--- a/lib/utils/email_util.dart
+++ b/lib/utils/email_util.dart
@@ -8,7 +8,6 @@ import 'package:flutter_email_sender/flutter_email_sender.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:photos/ui/log_file_viewer.dart';
 import 'package:photos/utils/dialog_util.dart';
-import 'package:photos/utils/navigation_util.dart';
 import 'package:share/share.dart';
 import 'package:super_logging/super_logging.dart';
 
diff --git a/lib/utils/share_util.dart b/lib/utils/share_util.dart
index 3fb9d673d..33bfdd5bc 100644
--- a/lib/utils/share_util.dart
+++ b/lib/utils/share_util.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:io';
 import 'package:logging/logging.dart';
 import 'package:intl/intl.dart';
 import 'package:path/path.dart';