diff --git a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/fullscreen/FullscreenAnnouncementView.kt b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/fullscreen/FullscreenAnnouncementView.kt
index cb962f8968..b724bfacc7 100644
--- a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/fullscreen/FullscreenAnnouncementView.kt
+++ b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/fullscreen/FullscreenAnnouncementView.kt
@@ -121,7 +121,6 @@ private fun FullscreenAnnouncementHeader(
         subTitle = announcement.subtitle(),
         iconStyle = BigIcon.Style.Default(
             vectorIcon = announcement.icon(),
-            usePrimaryTint = true,
         ),
     )
 }
diff --git a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutView.kt b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutView.kt
index a381c27252..40ab488f11 100644
--- a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutView.kt
+++ b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutView.kt
@@ -70,8 +70,7 @@ private fun SignedOutHeader() {
         title = stringResource(id = R.string.screen_signed_out_title),
         subTitle = stringResource(id = R.string.screen_signed_out_subtitle_v2),
         iconStyle = BigIcon.Style.Default(
-            CompoundIcons.Devices(),
-            usePrimaryTint = true,
+            vectorIcon = CompoundIcons.Devices(),
         ),
     )
 }
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt
index 09900576ec..839a76a9a9 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt
@@ -357,7 +357,7 @@ private fun EmptySpaceView(
         IconTitleSubtitleMolecule(
             title = stringResource(R.string.screen_space_empty_state_title),
             subTitle = null,
-            iconStyle = BigIcon.Style.Default(vectorIcon = CompoundIcons.Room(), usePrimaryTint = true),
+            iconStyle = BigIcon.Style.Default(vectorIcon = CompoundIcons.Room()),
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(top = 40.dp, start = 24.dp, end = 24.dp, bottom = 24.dp),
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitleSubtitleMolecule.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitleSubtitleMolecule.kt
index 56255d7623..a0339b8572 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitleSubtitleMolecule.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitleSubtitleMolecule.kt
@@ -32,6 +32,8 @@ import io.element.android.libraries.designsystem.theme.components.Text
 /**
  * IconTitleSubtitleMolecule is a molecule which displays an icon, a title and a subtitle.
  *
+ * Ref: https://www.figma.com/design/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?node-id=1964-3385
+ *
  * @param title the title to display
  * @param subTitle the subtitle to display
  * @param iconStyle the style of the [BigIcon] to display
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/BigIcon.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/BigIcon.kt
index cf6329ee66..668c9b571c 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/BigIcon.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/BigIcon.kt
@@ -53,13 +53,11 @@ object BigIcon {
          * @param vectorIcon the [ImageVector] to display
          * @param contentDescription the content description of the icon, if any. It defaults to `null`
          * @param useCriticalTint whether the icon and background should be rendered using critical tint
-         * @param usePrimaryTint whether the icon should be rendered using primary tint
          */
         data class Default(
             val vectorIcon: ImageVector,
             val contentDescription: String? = null,
             val useCriticalTint: Boolean = false,
-            val usePrimaryTint: Boolean = false,
         ) : Style
 
         /**
@@ -129,10 +127,8 @@ object BigIcon {
             val iconTint = when (style) {
                 is Style.Default -> if (style.useCriticalTint) {
                     ElementTheme.colors.iconCriticalPrimary
-                } else if (style.usePrimaryTint) {
-                    ElementTheme.colors.iconPrimary
                 } else {
-                    ElementTheme.colors.iconSecondary
+                    ElementTheme.colors.iconPrimary
                 }
                 Style.Alert,
                 Style.AlertSolid -> ElementTheme.colors.iconCriticalPrimary
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/file/MediaFileView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/file/MediaFileView.kt
index 89e02b616a..aac834a6e2 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/file/MediaFileView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/file/MediaFileView.kt
@@ -71,7 +71,6 @@ fun MediaFileView(
                 modifier = Modifier.align(Alignment.CenterHorizontally),
                 style = BigIcon.Style.Default(
                     vectorIcon = icon,
-                    usePrimaryTint = true,
                 ),
             )
             if (info != null) {