diff --git a/Core b/Core
index d2cc76bb8be..bc9ae4e5e68 160000
--- a/Core
+++ b/Core
@@ -1 +1 @@
-Subproject commit d2cc76bb8be9fb7f2b3e81666140c2199968c05a
+Subproject commit bc9ae4e5e68767b9d842850a245a6c7b644dc69a
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/ItemSettingView.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/ItemSettingView.kt
index 43e8aded9af..948fb4518ed 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/settings/ItemSettingView.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/ItemSettingView.kt
@@ -50,7 +50,7 @@ class ItemSettingView @JvmOverloads constructor(
     init {
         attrs?.getAttributes(context, R.styleable.ItemSettingView) {
             with(binding) {
-                action = Action.values()[getInteger(R.styleable.ItemSettingView_itemAction, 0)]
+                action = Action.entries[getInteger(R.styleable.ItemSettingView_itemAction, 0)]
 
                 title.text = getString(R.styleable.ItemSettingView_title) ?: ""
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiPropositionFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiPropositionFragment.kt
index db8580707b4..9986c922ad7 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiPropositionFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiPropositionFragment.kt
@@ -214,7 +214,7 @@ class AiPropositionFragment : Fragment() {
     }
 
     private fun onMenuItemClicked(menuItemId: Int) = with(aiViewModel) {
-        val shortcut = Shortcut.values().find { it.menuId == menuItemId }!!
+        val shortcut = Shortcut.entries.find { it.menuId == menuItemId }!!
         trackAiWriterEvent(shortcut.matomoValue)
 
         if (shortcut == Shortcut.MODIFY) {
diff --git a/app/src/main/java/com/infomaniak/mail/views/AttachmentDetailsView.kt b/app/src/main/java/com/infomaniak/mail/views/AttachmentDetailsView.kt
index 396b0e76959..803b797be25 100644
--- a/app/src/main/java/com/infomaniak/mail/views/AttachmentDetailsView.kt
+++ b/app/src/main/java/com/infomaniak/mail/views/AttachmentDetailsView.kt
@@ -42,7 +42,7 @@ class AttachmentDetailsView @JvmOverloads constructor(
 
     init {
         attrs?.getAttributes(context, R.styleable.AttachmentDetailsView) {
-            val displayStyle = DisplayStyle.values()[getInteger(R.styleable.AttachmentDetailsView_displayStyle, 0)]
+            val displayStyle = DisplayStyle.entries[getInteger(R.styleable.AttachmentDetailsView_displayStyle, 0)]
             val iconSize = context.resources.getDimension(displayStyle.iconSize).toInt()
             val marginSize = context.resources.getDimension(displayStyle.marginSize).toInt()
 
diff --git a/app/src/main/java/com/infomaniak/mail/views/itemViews/DecoratedItemView.kt b/app/src/main/java/com/infomaniak/mail/views/itemViews/DecoratedItemView.kt
index 2bac51b1bc4..3e1d9360a96 100644
--- a/app/src/main/java/com/infomaniak/mail/views/itemViews/DecoratedItemView.kt
+++ b/app/src/main/java/com/infomaniak/mail/views/itemViews/DecoratedItemView.kt
@@ -94,10 +94,10 @@ sealed class DecoratedItemView @JvmOverloads constructor(
     init {
         attrs?.getAttributes(context, R.styleable.DecoratedItemView) {
             icon = getDrawable(R.styleable.DecoratedItemView_icon)
-            itemStyle = SelectionStyle.values()[getInteger(R.styleable.DecoratedItemView_itemStyle, 0)]
+            itemStyle = SelectionStyle.entries[getInteger(R.styleable.DecoratedItemView_itemStyle, 0)]
             maxLines = getInteger(R.styleable.DecoratedItemView_maxLines, maxLines)
             text = getString(R.styleable.DecoratedItemView_text)
-            textWeight = TextWeight.values()[getInteger(R.styleable.DecoratedItemView_textWeight, 0)]
+            textWeight = TextWeight.entries[getInteger(R.styleable.DecoratedItemView_textWeight, 0)]
         }
     }