diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7666c9f18..9925e25f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,11 @@ All notable changes to this project will be documented in this file.
 ### Changed
 
 - upgraded Flutter to stable v3.0.0
+- stretching overscroll effect
+
+### Fixed
+
+- Map: grey Google Map layer when size changed
 
 ## <a id="v1.6.4"></a>[v1.6.4] - 2022-04-19
 
diff --git a/lib/widgets/aves_app.dart b/lib/widgets/aves_app.dart
index 90a86a79e..a06e74c9e 100644
--- a/lib/widgets/aves_app.dart
+++ b/lib/widgets/aves_app.dart
@@ -117,30 +117,28 @@ class _AvesAppState extends State<AvesApp> with WidgetsBindingObserver {
                           final settingsLocale = s.item1;
                           final areAnimationsEnabled = s.item2;
                           final themeBrightness = s.item3;
+
+                          final pageTransitionsTheme = areAnimationsEnabled
+                              // Flutter has various page transition implementations for Android:
+                              // - `FadeUpwardsPageTransitionsBuilder` on Oreo / API 27 and below
+                              // - `OpenUpwardsPageTransitionsBuilder` on Pie / API 28
+                              // - `ZoomPageTransitionsBuilder` on Android 10 / API 29 and above (default in Flutter v3.0.0)
+                              ? const PageTransitionsTheme()
+                              // strip page transitions used by `MaterialPageRoute`
+                              : const DirectPageTransitionsTheme();
+
                           return MaterialApp(
                             navigatorKey: AvesApp.navigatorKey,
                             home: home,
                             navigatorObservers: _navigatorObservers,
-                            builder: (context, child) {
-                              // Flutter has various page transition implementations for Android:
-                              // - `FadeUpwardsPageTransitionsBuilder` on Oreo / API 27 and below
-                              // - `OpenUpwardsPageTransitionsBuilder` on Pie / API 28
-                              // - `ZoomPageTransitionsBuilder` on Android 10 / API 29 and above
-                              // As of Flutter v2.8.1, `FadeUpwardsPageTransitionsBuilder` is the default, regardless of versions.
-                              // In practice, `ZoomPageTransitionsBuilder` feels unstable when transitioning from Album to Collection.
-                              if (!areAnimationsEnabled) {
-                                child = Theme(
-                                  data: Theme.of(context).copyWith(
-                                    // strip page transitions used by `MaterialPageRoute`
-                                    pageTransitionsTheme: DirectPageTransitionsTheme(),
-                                  ),
-                                  child: child!,
-                                );
-                              }
-                              return AvesColorsProvider(
+                            builder: (context, child) => AvesColorsProvider(
+                              child: Theme(
+                                data: Theme.of(context).copyWith(
+                                  pageTransitionsTheme: pageTransitionsTheme,
+                                ),
                                 child: child!,
-                              );
-                            },
+                              ),
+                            ),
                             onGenerateTitle: (context) => context.l10n.appName,
                             theme: Themes.lightTheme,
                             darkTheme: themeBrightness == AvesThemeBrightness.black ? Themes.blackTheme : Themes.darkTheme,
diff --git a/lib/widgets/common/behaviour/routes.dart b/lib/widgets/common/behaviour/routes.dart
index 4e90b00cb..a9f5760f9 100644
--- a/lib/widgets/common/behaviour/routes.dart
+++ b/lib/widgets/common/behaviour/routes.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 
 class DirectPageTransitionsTheme extends PageTransitionsTheme {
+  const DirectPageTransitionsTheme();
+
   @override
   Widget buildTransitions<T>(
     PageRoute<T> route,