diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt
index 65bc90380aaf..3f607b3e6b0b 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt
@@ -414,7 +414,7 @@ class OCFileListDelegate(
                 if (showShareAvatar) null else R.drawable.shared_via_users to R.string.shared_icon_shared
             }
 
-            file.isSharedViaLink -> R.drawable.shared_via_link to R.string.shared_icon_shared_via_link
+            file.isShared || file.isSharedViaLink -> R.drawable.shared_via_link to R.string.shared_icon_shared_via_link
 
             else -> R.drawable.ic_unshared to R.string.shared_icon_share
         }
diff --git a/app/src/main/java/com/owncloud/android/ui/asynctasks/GallerySearchTask.kt b/app/src/main/java/com/owncloud/android/ui/asynctasks/GallerySearchTask.kt
index d3d4a0660875..138bbf8c8814 100644
--- a/app/src/main/java/com/owncloud/android/ui/asynctasks/GallerySearchTask.kt
+++ b/app/src/main/java/com/owncloud/android/ui/asynctasks/GallerySearchTask.kt
@@ -70,10 +70,11 @@ class GallerySearchTask(
         ocCapability: com.owncloud.android.lib.resources.status.OCCapability
     ): SearchRemoteOperation =
         SearchRemoteOperation("", SearchRemoteOperation.SearchType.GALLERY_SEARCH, false, ocCapability).apply {
-            setLimit(limit)
-            setEndDate(endDate)
+            limit = this@GallerySearchTask.limit
+            endDate =  this@GallerySearchTask.endDate
+
             // workaround to keep SearchRemoteOperation functioning correctly even if we don't actively use startDate
-            setStartDate(0L)
+            startDate = 0L
         }
 
     private fun logSearchStart() {
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt
index 26a8943b311d..d0e72abf2afa 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt
@@ -208,7 +208,7 @@ class OCFileListSearchTask(
 
             for (obj in data) {
                 try {
-                    val remoteFile = obj as? RemoteFile ?: continue
+                    val remoteFile = (obj as? RemoteFile) ?: continue
                     var ocFile = FileStorageUtils.fillOCFile(remoteFile)
                     FileStorageUtils.searchForLocalFileInDefaultPath(ocFile, currentUser.accountName)
                     ocFile = storageManager.saveFileWithParent(ocFile, activity)