diff --git a/app/src/main/java/com/infomaniak/drive/data/cache/FileMigration.kt b/app/src/main/java/com/infomaniak/drive/data/cache/FileMigration.kt
index b2e615603c..c47b34d6c4 100644
--- a/app/src/main/java/com/infomaniak/drive/data/cache/FileMigration.kt
+++ b/app/src/main/java/com/infomaniak/drive/data/cache/FileMigration.kt
@@ -249,7 +249,7 @@ class FileMigration : RealmMigration {
                 renameField("createdAt", File::addedAt.name)
                 renameField("fileCreatedAt", File::createdAt.name)
                 renameField("nameNaturalSorting", File::sortedName.name)
-                renameField("onlyoffice", File::hasOnlyoffice.name)
+                renameField("onlyoffice", File::hasOnlyOffice.name)
 
                 addField(File::parentId.name, Int::class.java, FieldAttribute.REQUIRED)
                 addRealmObjectField(File::conversion.name, fileConversionSchema)
diff --git a/app/src/main/java/com/infomaniak/drive/data/models/File.kt b/app/src/main/java/com/infomaniak/drive/data/models/File.kt
index e5ae227c39..6d43f54b78 100644
--- a/app/src/main/java/com/infomaniak/drive/data/models/File.kt
+++ b/app/src/main/java/com/infomaniak/drive/data/models/File.kt
@@ -137,8 +137,8 @@ open class File(
 
     ) : RealmObject(), Parcelable {
 
-    val hasThumbnail inline get() = supportedBy?.contains(SupportedByType.THUMBNAIL.apiValue) ?: false
-    val hasOnlyoffice inline get() = supportedBy?.contains(SupportedByType.ONLYOFFICE.apiValue) ?: false
+    val hasThumbnail inline get() = supportedBy?.contains(SupportedByType.THUMBNAIL.apiValue) == true
+    val hasOnlyOffice inline get() = supportedBy?.contains(SupportedByType.ONLYOFFICE.apiValue) == true
 
     @LinkingObjects("children")
     val localParent: RealmResults<File>? = null
@@ -171,7 +171,7 @@ open class File(
     }
 
     fun isOnlyOfficePreview(): Boolean {
-        return hasOnlyoffice || conversion?.whenOnlyoffice == true
+        return hasOnlyOffice || conversion?.whenOnlyoffice == true
     }
 
     fun isDropBox() = getVisibilityType() == VisibilityType.IS_DROPBOX
diff --git a/app/src/main/java/com/infomaniak/drive/ui/fileList/fileDetails/FileDetailsInfoFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/fileList/fileDetails/FileDetailsInfoFragment.kt
index 0bef12b989..e532868489 100644
--- a/app/src/main/java/com/infomaniak/drive/ui/fileList/fileDetails/FileDetailsInfoFragment.kt
+++ b/app/src/main/java/com/infomaniak/drive/ui/fileList/fileDetails/FileDetailsInfoFragment.kt
@@ -196,7 +196,7 @@ class FileDetailsInfoFragment : FileDetailsSubFragment() {
         shareLink = newShareLink
         val (permissionsGroup, currentPermission) = selectPermissions(
             isFolder = file.isFolder(),
-            isOnlyOffice = file.hasOnlyoffice,
+            isOnlyOffice = file.hasOnlyOffice,
             shareLinkExist = newShareLink != null,
         )
         findNavController().navigate(
@@ -215,7 +215,7 @@ class FileDetailsInfoFragment : FileDetailsSubFragment() {
                 fileId = file.id,
                 driveId = file.driveId,
                 shareLink = newShareLink,
-                isOnlyOfficeFile = file.hasOnlyoffice,
+                isOnlyOfficeFile = file.hasOnlyOffice,
                 isFolder = file.isFolder(),
             )
         )
diff --git a/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/FileShareDetailsFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/FileShareDetailsFragment.kt
index da4697ba7b..42db35e6cb 100644
--- a/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/FileShareDetailsFragment.kt
+++ b/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/FileShareDetailsFragment.kt
@@ -230,7 +230,7 @@ class FileShareDetailsFragment : Fragment() {
         shareLink = newShareLink
         val (permissionsGroup, currentPermission) = FileDetailsInfoFragment.selectPermissions(
             isFolder = file.isFolder(),
-            isOnlyOffice = file.hasOnlyoffice,
+            isOnlyOffice = file.hasOnlyOffice,
             shareLinkExist = shareLink != null,
         )
         safeNavigate(
@@ -249,7 +249,7 @@ class FileShareDetailsFragment : Fragment() {
                 fileId = file.id,
                 driveId = file.driveId,
                 shareLink = newShareLink,
-                isOnlyOfficeFile = file.hasOnlyoffice,
+                isOnlyOfficeFile = file.hasOnlyOffice,
                 isFolder = file.isFolder(),
             )
         )
diff --git a/app/src/main/java/com/infomaniak/drive/views/FileInfoActionsView.kt b/app/src/main/java/com/infomaniak/drive/views/FileInfoActionsView.kt
index a91ae92c07..0bf434d11e 100644
--- a/app/src/main/java/com/infomaniak/drive/views/FileInfoActionsView.kt
+++ b/app/src/main/java/com/infomaniak/drive/views/FileInfoActionsView.kt
@@ -28,7 +28,6 @@ import androidx.annotation.CallSuper
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
 import androidx.navigation.fragment.findNavController
@@ -133,7 +132,7 @@ class FileInfoActionsView @JvmOverloads constructor(
                 || isSharedWithMe
                 || currentFile.getVisibilityType() == IS_TEAM_SPACE
                 || currentFile.getVisibilityType() == IS_SHARED_SPACE
-        editDocument.isVisible = (currentFile.hasOnlyoffice && rights.canWrite)
+        editDocument.isVisible = (currentFile.hasOnlyOffice && rights.canWrite)
                 || (currentFile.conversion?.whenOnlyoffice == true)
         leaveShare.isVisible = rights.canLeave == true
         cancelExternalImport.isVisible = file.isImporting()
diff --git a/app/src/main/java/com/infomaniak/drive/views/PreviewHeaderView.kt b/app/src/main/java/com/infomaniak/drive/views/PreviewHeaderView.kt
index 6183774de3..566aad94d2 100644
--- a/app/src/main/java/com/infomaniak/drive/views/PreviewHeaderView.kt
+++ b/app/src/main/java/com/infomaniak/drive/views/PreviewHeaderView.kt
@@ -65,15 +65,11 @@ class PreviewHeaderView @JvmOverloads constructor(
         }
     }
 
-    fun setup(
-        onBackClicked: (() -> Unit)? = null,
-        onOpenWithClicked: (() -> Unit)? = null,
-        onEditClicked: (() -> Unit)? = null,
-    ) = with(binding) {
-        backButton.setOnClickListener { onBackClicked?.invoke() }
-        openWithButton.setOnClickListener { onOpenWithClicked?.invoke() }
-        editButton.apply {
-            setOnClickListener { onEditClicked?.invoke() }
+    fun setup(onBackClicked: (() -> Unit)? = null, onOpenWithClicked: (() -> Unit)? = null, onEditClicked: (() -> Unit)? = null) {
+        with(binding) {
+            backButton.setOnClickListener { onBackClicked?.invoke() }
+            openWithButton.setOnClickListener { onOpenWithClicked?.invoke() }
+            editButton.setOnClickListener { onEditClicked?.invoke() }
         }
     }
 
diff --git a/app/src/main/java/com/infomaniak/drive/views/ShareLinkContainerView.kt b/app/src/main/java/com/infomaniak/drive/views/ShareLinkContainerView.kt
index 09a95932bb..dfe2e87bcf 100644
--- a/app/src/main/java/com/infomaniak/drive/views/ShareLinkContainerView.kt
+++ b/app/src/main/java/com/infomaniak/drive/views/ShareLinkContainerView.kt
@@ -163,7 +163,7 @@ class ShareLinkContainerView @JvmOverloads constructor(
         return context.getString(resId, permission, fileName, password, validityDate)
     }
 
-    private fun File.getTypeName(context: Context): String = context.getString(getTypeName(isFolder(), hasOnlyoffice))
+    private fun File.getTypeName(context: Context): String = context.getString(getTypeName(isFolder(), hasOnlyOffice))
 
     companion object {
 
diff --git a/app/src/main/res/layout/preview_header_view.xml b/app/src/main/res/layout/preview_header_view.xml
index 88e85e6046..c6f53a5288 100644
--- a/app/src/main/res/layout/preview_header_view.xml
+++ b/app/src/main/res/layout/preview_header_view.xml
@@ -72,7 +72,6 @@
             android:layout_width="50dp"
             android:layout_height="50dp"
             android:contentDescription="@string/buttonEdit"
-            android:visibility="gone"
             app:backgroundTint="@color/previewBackgroundTransparent"
             app:icon="@drawable/ic_edit_document"
             app:iconSize="20dp"