diff --git a/.zenodo.json b/.zenodo.json
index 22d39916a..26f272ee5 100644
--- a/.zenodo.json
+++ b/.zenodo.json
@@ -2,7 +2,7 @@
     "description": "<p>Mergin Maps mobile app is a QGIS powered app for Android and iOS devices.</p>", 
     "license": "GPLv3", 
     "title": "Mergin Maps mobile app", 
-    "version": "2025.7.0",
+    "version": "2025.8.0",
     "upload_type": "software", 
     "publication_date": "2022-02-24", 
     "creators": [
@@ -39,7 +39,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/MerginMaps/mobile/tree/2025.7.0", 
+            "identifier": "https://github.com/MerginMaps/mobile/tree/2025.8.0", 
             "relation": "isSupplementTo"
         }, 
         {
diff --git a/CITATION.cff b/CITATION.cff
index 9b3fedd36..9c7aa026f 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -1,4 +1,4 @@
-cff-version: 2025.7.0
+cff-version: 2025.8.0
 message: "If you use this software, please cite it as below."
 authors:
 - family-names: "Martin"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6a8d5cb0..dd912c033 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.22)
 
 # Note: To update version use script/update_all_versions.bash
 set(MM_VERSION_MAJOR "2025")
-set(MM_VERSION_MINOR "7")
+set(MM_VERSION_MINOR "8")
 set(MM_VERSION_PATCH "0")
 
 if (VCPKG_TARGET_TRIPLET MATCHES ".*ios.*")
diff --git a/app/qml/layers/MMFeaturesListPage.qml b/app/qml/layers/MMFeaturesListPage.qml
index 952894924..595441050 100644
--- a/app/qml/layers/MMFeaturesListPage.qml
+++ b/app/qml/layers/MMFeaturesListPage.qml
@@ -50,6 +50,9 @@ MMComponents.MMPage {
 
       width: parent.width
 
+      cacheBuffer: height
+      snapMode: ListView.SnapToItem
+
       anchors {
         top: searchBar.bottom
         bottom: parent.bottom
@@ -73,6 +76,7 @@ MMComponents.MMPage {
       }
 
       footer: MMComponents.MMListSpacer {
+        id: spacer
         height: __style.margin20 + ( root.hasToolbar ? 0 : __style.safeAreaBottom ) + ( addButton.visible ? addButton.height : 0 )
       }
     }
diff --git a/vcpkg.json b/vcpkg.json
index f5411a67d..7bb869413 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -9,7 +9,7 @@
     },
     "name": "merginmaps-mobile-app",
     "description": "Collect. Share. Publish.",
-    "version": "2025.7.0",
+    "version": "2025.8.0",
     "homepage": "https://github.com/merginmaps/mobile",
     "dependencies": [
         {