diff --git a/lib/ui/account/password_entry_page.dart b/lib/ui/account/password_entry_page.dart
index 5a73c9464..e574bc928 100644
--- a/lib/ui/account/password_entry_page.dart
+++ b/lib/ui/account/password_entry_page.dart
@@ -101,7 +101,7 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
       resizeToAvoidBottomInset: isKeypadOpen,
       appBar: AppBar(
         leading: widget.mode == PasswordEntryMode.reset
-            ? Container()
+            ? const SizedBox.shrink()
             : IconButton(
                 icon: const Icon(Icons.arrow_back),
                 color: Theme.of(context).iconTheme.color,
@@ -142,7 +142,7 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
       passwordStrengthColor = Colors.orangeAccent;
     }
     if (_volatilePassword != null) {
-      return Container();
+      return const SizedBox.shrink();
     }
     return Column(
       children: [
diff --git a/lib/ui/huge_listview/scroll_bar_thumb.dart b/lib/ui/huge_listview/scroll_bar_thumb.dart
index 8e871354d..a18ab86f9 100644
--- a/lib/ui/huge_listview/scroll_bar_thumb.dart
+++ b/lib/ui/huge_listview/scroll_bar_thumb.dart
@@ -143,7 +143,7 @@ class SlideFadeTransition extends StatelessWidget {
     return AnimatedBuilder(
       animation: animation!,
       builder: (context, child) =>
-          animation!.value == 0.0 ? Container() : child!,
+          animation!.value == 0.0 ? const SizedBox.shrink() : child!,
       child: SlideTransition(
         position: Tween(
           begin: const Offset(0.3, 0.0),
diff --git a/lib/ui/payment/payment_web_page.dart b/lib/ui/payment/payment_web_page.dart
index 3889894c5..2b9cd4e90 100644
--- a/lib/ui/payment/payment_web_page.dart
+++ b/lib/ui/payment/payment_web_page.dart
@@ -63,7 +63,7 @@ class _PaymentWebPageState extends State<PaymentWebPage> {
           children: <Widget>[
             (progress != 1.0)
                 ? LinearProgressIndicator(value: progress)
-                : Container(),
+                : const SizedBox.shrink(),
             Expanded(
               child: InAppWebView(
                 initialUrlRequest: URLRequest(url: initPaymentUrl),
diff --git a/lib/ui/settings/app_version_widget.dart b/lib/ui/settings/app_version_widget.dart
index d28ab3397..4dda6c9cb 100644
--- a/lib/ui/settings/app_version_widget.dart
+++ b/lib/ui/settings/app_version_widget.dart
@@ -46,7 +46,7 @@ class _AppVersionWidgetState extends State<AppVersionWidget> {
               ),
             );
           }
-          return Container();
+          return const SizedBox.shrink();
         },
       ),
     );
diff --git a/lib/ui/settings/backup/backup_folder_selection_page.dart b/lib/ui/settings/backup/backup_folder_selection_page.dart
index 3ed738316..3ecd89561 100644
--- a/lib/ui/settings/backup/backup_folder_selection_page.dart
+++ b/lib/ui/settings/backup/backup_folder_selection_page.dart
@@ -109,7 +109,7 @@ class _BackupFolderSelectionPageState extends State<BackupFolderSelectionPage> {
             padding: EdgeInsets.all(10),
           ),
           _deviceCollections == null
-              ? Container()
+              ? const SizedBox.shrink()
               : GestureDetector(
                   behavior: HitTestBehavior.translucent,
                   child: Padding(
diff --git a/lib/ui/tabs/shared/incoming_album_item.dart b/lib/ui/tabs/shared/incoming_album_item.dart
index 94ff5c65c..34d92d3b4 100644
--- a/lib/ui/tabs/shared/incoming_album_item.dart
+++ b/lib/ui/tabs/shared/incoming_album_item.dart
@@ -90,7 +90,7 @@ class IncomingAlbumItem extends StatelessWidget {
                       ),
                     );
                   } else {
-                    return Container();
+                    return const SizedBox.shrink();
                   }
                 },
               ),
diff --git a/lib/ui/tabs/shared/outgoing_album_item.dart b/lib/ui/tabs/shared/outgoing_album_item.dart
index 6819fd3b6..b65acde2b 100644
--- a/lib/ui/tabs/shared/outgoing_album_item.dart
+++ b/lib/ui/tabs/shared/outgoing_album_item.dart
@@ -80,11 +80,11 @@ class OutgoingAlbumItem extends StatelessWidget {
                                   color: warning500,
                                 )
                               : const Icon(Icons.link))
-                          : Container(),
+                          : const SizedBox.shrink(),
                     ],
                   ),
                   shareesName.isEmpty
-                      ? Container()
+                      ? const SizedBox.shrink()
                       : Padding(
                           padding: const EdgeInsets.fromLTRB(0, 4, 0, 0),
                           child: Text(
diff --git a/lib/ui/tools/deduplicate_page.dart b/lib/ui/tools/deduplicate_page.dart
index 671873a6b..9044544af 100644
--- a/lib/ui/tools/deduplicate_page.dart
+++ b/lib/ui/tools/deduplicate_page.dart
@@ -309,7 +309,7 @@ class _DeduplicatePageState extends State<DeduplicatePage> {
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
       crossAxisAlignment: CrossAxisAlignment.end,
       children: [
-        Container(),
+        const SizedBox.shrink(),
         PopupMenuButton(
           initialValue: sortKey.index,
           child: Padding(
diff --git a/lib/ui/viewer/gallery/trash_page.dart b/lib/ui/viewer/gallery/trash_page.dart
index d7f4c726d..e178d7fee 100644
--- a/lib/ui/viewer/gallery/trash_page.dart
+++ b/lib/ui/viewer/gallery/trash_page.dart
@@ -111,7 +111,7 @@ class TrashPage extends StatelessWidget {
             ),
           );
         } else {
-          return Container();
+          return const SizedBox.shrink();
         }
       },
     );