diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a588e6c5ff..b53c6716c28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Table of Contents
 
-* [Changelog for unreleased](#changelog-for-owncloud-android-client-unreleased-unreleased)
+* [Changelog for 4.8.2](#changelog-for-owncloud-android-client-482-2026-06-30)
 * [Changelog for 4.8.1](#changelog-for-owncloud-android-client-481-2026-06-09)
 * [Changelog for 4.8.0](#changelog-for-owncloud-android-client-480-2026-05-18)
 * [Changelog for 4.7.0](#changelog-for-owncloud-android-client-470-2025-11-17)
@@ -33,12 +33,12 @@
 * [Changelog for 2.18.1](#changelog-for-owncloud-android-client-2181-2021-07-20)
 * [Changelog for 2.18.0](#changelog-for-owncloud-android-client-2180-2021-05-24)
 * [Changelog for 2.17 versions and below](#changelog-for-217-versions-and-below)
-# Changelog for ownCloud Android Client [unreleased] (UNRELEASED)
+# Changelog for ownCloud Android Client [4.8.2] (2026-06-30)
 
-The following sections list the changes in ownCloud Android Client unreleased relevant to
+The following sections list the changes in ownCloud Android Client 4.8.2 relevant to
 ownCloud admins and users.
 
-[unreleased]: https://github.com/owncloud/android/compare/v4.8.1...master
+[4.8.2]: https://github.com/owncloud/android/compare/v4.8.1...v4.8.2
 
 ## Summary
 
diff --git a/changelog/unreleased/4887 b/changelog/4.8.2_2026-06-30/4887
similarity index 100%
rename from changelog/unreleased/4887
rename to changelog/4.8.2_2026-06-30/4887
diff --git a/changelog/unreleased/4897 b/changelog/4.8.2_2026-06-30/4897
similarity index 100%
rename from changelog/unreleased/4897
rename to changelog/4.8.2_2026-06-30/4897
diff --git a/changelog/unreleased/4901 b/changelog/4.8.2_2026-06-30/4901
similarity index 100%
rename from changelog/unreleased/4901
rename to changelog/4.8.2_2026-06-30/4901
diff --git a/owncloudApp/build.gradle b/owncloudApp/build.gradle
index c0dc4469430..273c44cc2f1 100644
--- a/owncloudApp/build.gradle
+++ b/owncloudApp/build.gradle
@@ -101,8 +101,8 @@ android {
 
         testInstrumentationRunner "com.owncloud.android.utils.OCTestAndroidJUnitRunner"
 
-        versionCode = 48000100
-        versionName = "4.8.1"
+        versionCode = 48000200
+        versionName = "4.8.2"
 
         buildConfigField "String", gitRemote, "\"" + getGitOriginRemote() + "\""
         buildConfigField "String", commitSHA1, "\"" + getLatestGitHash() + "\""
diff --git a/owncloudApp/src/main/java/com/owncloud/android/extensions/ActivityExt.kt b/owncloudApp/src/main/java/com/owncloud/android/extensions/ActivityExt.kt
index c7f45020ba8..58a71bf3dd7 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/extensions/ActivityExt.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/extensions/ActivityExt.kt
@@ -104,9 +104,8 @@ fun Activity.showSnackbarWithAction(
     actionText: CharSequence,
     action: () -> Unit,
     duration: Int = Snackbar.LENGTH_LONG,
-    layoutId: Int = android.R.id.content
 ) {
-    Snackbar.make(findViewById(layoutId), message, duration)
+    Snackbar.make(findViewById(android.R.id.content), message, duration)
         .setAction(actionText) { action() }
         .show()
 }
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileActivity.java
index 863316fa2b5..ddead51aa02 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileActivity.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileActivity.java
@@ -289,8 +289,7 @@ protected void showRequestAccountChangeNotice(String errorMessage, boolean mustC
                         requestCredentialsUpdate();
                         return Unit.INSTANCE;
                     },
-                    Snackbar.LENGTH_INDEFINITE,
-                    android.R.id.content
+                    Snackbar.LENGTH_INDEFINITE
             );
         }
     }
@@ -304,8 +303,7 @@ protected void showRequestRegainAccess() {
                     requestCredentialsUpdate();
                     return Unit.INSTANCE;
                 },
-                Snackbar.LENGTH_INDEFINITE,
-                android.R.id.content
+                Snackbar.LENGTH_INDEFINITE
         );
     }
 
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
index 7b7d2b4a56b..e55a7bb4e7c 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
@@ -1178,7 +1178,6 @@ class FileDisplayActivity : FileActivity(),
                     }
                     updateBottombar(targetFolderSpace)
                 },
-                layoutId = R.id.list_layout
             )
         } else {
             showMessageInSnackbar(R.id.list_layout, message)