diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86a4b0550c..5f17f25c5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.11.2] - UNRELEASED
 
+### Changed / Improved
+- optimizations - improved prefetch strategy - @gibkigonzo (#4080)
+
 ### Fixed
 - add disconnect and sync options for cart/clear - @gibkigonzo (#4062)
 - add '1' as searched value for 'is_user_defined' and 'is_visible' (createAttributesListQuery) - @gibkigonzo (#4075)
diff --git a/core/build/webpack.client.config.ts b/core/build/webpack.client.config.ts
index 7eb6814584..6a3d71fea1 100644
--- a/core/build/webpack.client.config.ts
+++ b/core/build/webpack.client.config.ts
@@ -9,7 +9,7 @@ const config = merge(base, {
     splitChunks: {
       cacheGroups: {
         commons: {
-          test: /[\\/]node_modules[\\/](vue|vuex|vue-router|vue-meta|vue-i18n|vuex-router-sync|localforage)[\\/]/,
+          test: /[\\/]node_modules[\\/](vue|vuex|vue-router|vue-meta|vue-i18n|vuex-router-sync|localforage|lean-he|vue-lazyload|js-sha3|dayjs|core-js|whatwg-fetch|vuelidate)[\\/]/,
           name: 'vendor',
           chunks: 'all'
         }
diff --git a/src/themes/default/components/core/ProductGallery.vue b/src/themes/default/components/core/ProductGallery.vue
index be9975b86c..cd928ea533 100644
--- a/src/themes/default/components/core/ProductGallery.vue
+++ b/src/themes/default/components/core/ProductGallery.vue
@@ -31,8 +31,7 @@ import onEscapePress from '@vue-storefront/core/mixins/onEscapePress'
 import NoSSR from 'vue-no-ssr'
 import ProductImage from './ProductImage'
 import { onlineHelper } from '@vue-storefront/core/helpers'
-
-const ProductGalleryCarousel = () => import(/* webpackChunkName: "vsf-product-gallery-carousel" */ './ProductGalleryCarousel.vue')
+import ProductGalleryCarousel from './ProductGalleryCarousel.vue'
 
 export default {
   components: {
diff --git a/src/themes/default/components/core/ProductGalleryOverlay.vue b/src/themes/default/components/core/ProductGalleryOverlay.vue
index d43979f438..d6154f283d 100644
--- a/src/themes/default/components/core/ProductGalleryOverlay.vue
+++ b/src/themes/default/components/core/ProductGalleryOverlay.vue
@@ -16,7 +16,7 @@
 </template>
 <script>
 import NoSSR from 'vue-no-ssr'
-const ProductGalleryZoomCarousel = () => import(/* webpackChunkName: "vsf-product-gallery-zoom-carousel" */ './ProductGalleryZoomCarousel.vue')
+import ProductGalleryZoomCarousel from './ProductGalleryZoomCarousel.vue'
 
 export default {
   name: 'ProductGalleryOverlay',
diff --git a/src/themes/default/components/core/ProductImage.vue b/src/themes/default/components/core/ProductImage.vue
index 9854f75695..21ebacf866 100644
--- a/src/themes/default/components/core/ProductImage.vue
+++ b/src/themes/default/components/core/ProductImage.vue
@@ -14,7 +14,7 @@
     <img
       v-if="!lowerQualityImageError || isOnline"
       v-show="showLowerQuality"
-      :src="image.loading"
+      v-lazy="image.loading"
       :alt="alt"
       @load="imageLoaded('lower', true)"
       @error="imageLoaded('lower', false)"
@@ -24,7 +24,7 @@
     <img
       v-if="!highQualityImageError || isOnline"
       v-show="showHighQuality"
-      :src="image.src"
+      v-lazy="image.src"
       :alt="alt"
       @load="imageLoaded('high', true)"
       @error="imageLoaded('high', false)"
diff --git a/src/themes/default/css/base/_fonts.scss b/src/themes/default/css/base/_fonts.scss
deleted file mode 100644
index c6203f700f..0000000000
--- a/src/themes/default/css/base/_fonts.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import url('https://fonts.googleapis.com/css?family=Playfair+Display:400,700|Roboto:400,700|Material+Icons&display=swap');
diff --git a/src/themes/default/css/main.scss b/src/themes/default/css/main.scss
index e09b296a12..3d0bdeaa1f 100644
--- a/src/themes/default/css/main.scss
+++ b/src/themes/default/css/main.scss
@@ -1,4 +1,3 @@
-@import 'base/fonts';
 @import 'vendor/flexboxgrid2';
 
 @import 'variables/variables';
diff --git a/src/themes/default/head.js b/src/themes/default/head.js
index fb70d4a69f..582643eecb 100644
--- a/src/themes/default/head.js
+++ b/src/themes/default/head.js
@@ -24,7 +24,8 @@ export default {
     { rel: 'apple-touch-startup-image', href: '/assets/apple_splash_1242.png', sizes: '1242x2208' },
     { rel: 'apple-touch-startup-image', href: '/assets/apple_splash_750.png', sizes: '750x1334' },
     { rel: 'apple-touch-startup-image', href: '/assets/apple_splash_640.png', sizes: '640x1136' },
-    { rel: 'manifest', href: '/assets/manifest.json' }
+    { rel: 'manifest', href: '/assets/manifest.json' },
+    { rel: 'stylesheet', href: 'https://fonts.googleapis.com/css?family=Playfair+Display:400,700|Roboto:400,700|Material+Icons&display=swap' }
   ],
   script: [
     {