diff --git a/mobile/lib/ui/components/bottom_action_bar/bottom_action_bar_widget.dart b/mobile/lib/ui/components/bottom_action_bar/bottom_action_bar_widget.dart
index 0f31986598..f2c16c8c39 100644
--- a/mobile/lib/ui/components/bottom_action_bar/bottom_action_bar_widget.dart
+++ b/mobile/lib/ui/components/bottom_action_bar/bottom_action_bar_widget.dart
@@ -31,7 +31,7 @@ class BottomActionBarWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final bottomPadding = MediaQuery.of(context).padding.bottom;
+    final bottomPadding = MediaQuery.paddingOf(context).bottom;
     final widthOfScreen = MediaQuery.of(context).size.width;
     final colorScheme = getEnteColorScheme(context);
     final double leftRightPadding = widthOfScreen > restrictedMaxWidth
diff --git a/mobile/lib/ui/tools/editor/image_editor_page.dart b/mobile/lib/ui/tools/editor/image_editor_page.dart
index 455cd9443a..2ef93601f2 100644
--- a/mobile/lib/ui/tools/editor/image_editor_page.dart
+++ b/mobile/lib/ui/tools/editor/image_editor_page.dart
@@ -40,8 +40,8 @@ class ImageEditorPage extends StatefulWidget {
     this.imageProvider,
     this.originalFile,
     this.detailPageConfig, {
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   State<ImageEditorPage> createState() => _ImageEditorPageState();
@@ -105,7 +105,7 @@ class _ImageEditorPageState extends State<ImageEditorPage> {
               ],
             ),
             const Padding(padding: EdgeInsets.all(8)),
-            _buildBottomBar(),
+            SafeArea(child: _buildBottomBar()),
             Padding(padding: EdgeInsets.all(Platform.isIOS ? 16 : 6)),
           ],
         ),
@@ -338,10 +338,14 @@ class _ImageEditorPageState extends State<ImageEditorPage> {
       showToast(context, S.of(context).somethingWentWrong);
       return;
     }
-    _logger.info('Size before compression = ${result.length}');    
-    
+    _logger.info('Size before compression = ${result.length}');
+
     final ui.Image decodedResult = await decodeImageFromList(result);
-    result = await FlutterImageCompress.compressWithList(result, minWidth: decodedResult.width, minHeight: decodedResult.height);
+    result = await FlutterImageCompress.compressWithList(
+      result,
+      minWidth: decodedResult.width,
+      minHeight: decodedResult.height,
+    );
     _logger.info('Size after compression = ${result.length}');
     final Duration diff = DateTime.now().difference(start);
     _logger.info('image_editor time : $diff');
diff --git a/mobile/lib/ui/viewer/gallery/collection_page.dart b/mobile/lib/ui/viewer/gallery/collection_page.dart
index b4f1a12c82..aff40ef777 100644
--- a/mobile/lib/ui/viewer/gallery/collection_page.dart
+++ b/mobile/lib/ui/viewer/gallery/collection_page.dart
@@ -18,7 +18,7 @@ import "package:photos/ui/viewer/gallery/collect_photos_bottom_buttons.dart";
 import "package:photos/ui/viewer/gallery/empty_album_state.dart";
 import 'package:photos/ui/viewer/gallery/empty_state.dart';
 import 'package:photos/ui/viewer/gallery/gallery.dart';
-import 'package:photos/ui/viewer/gallery/gallery_app_bar_widget.dart';
+import "package:photos/ui/viewer/gallery/gallery_app_bar_widget.dart";
 import "package:photos/ui/viewer/gallery/hierarchical_search_gallery.dart";
 import "package:photos/ui/viewer/gallery/state/gallery_files_inherited_widget.dart";
 import "package:photos/ui/viewer/gallery/state/inherited_search_filter_data.dart";
@@ -130,7 +130,7 @@ class CollectionPage extends StatelessWidget {
                   c.collection,
                   selectedFiles: _selectedFiles,
                 )
-              : const SizedBox.shrink(),
+              : null,
           body: SelectionState(
             selectedFiles: _selectedFiles,
             child: Stack(