diff --git a/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadStorageErrorDialogFragment.kt b/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadStorageErrorDialogFragment.kt
index 67c556043..f3b4b8f44 100644
--- a/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadStorageErrorDialogFragment.kt
+++ b/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadStorageErrorDialogFragment.kt
@@ -254,7 +254,7 @@ private fun StorageBar(
                     freeSpace.toFileSize(1, false)
                 ),
                 style = MaterialTheme.appTypography.labelSmall,
-                color = MaterialTheme.appColors.textFieldHint,
+                color = MaterialTheme.appColors.textSecondary,
                 modifier = Modifier.weight(1f)
             )
             Text(
diff --git a/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadView.kt b/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadView.kt
index 14ab4e66c..b9f498b88 100644
--- a/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadView.kt
+++ b/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadView.kt
@@ -53,7 +53,7 @@ fun DownloadDialogItem(
         Text(
             text = downloadDialogItem.size.toFileSize(1, false),
             style = MaterialTheme.appTypography.bodySmall,
-            color = MaterialTheme.appColors.textFieldHint
+            color = MaterialTheme.appColors.textSecondary
         )
     }
 }
diff --git a/core/src/main/java/org/openedx/core/ui/ComposeCommon.kt b/core/src/main/java/org/openedx/core/ui/ComposeCommon.kt
index d2a3c8dbc..32ec2bc91 100644
--- a/core/src/main/java/org/openedx/core/ui/ComposeCommon.kt
+++ b/core/src/main/java/org/openedx/core/ui/ComposeCommon.kt
@@ -275,7 +275,7 @@ fun SearchBar(
                     .testTag("txt_search_placeholder")
                     .fillMaxWidth(),
                 text = label,
-                color = MaterialTheme.appColors.textSecondary,
+                color = MaterialTheme.appColors.textFieldHint,
                 style = MaterialTheme.appTypography.bodyMedium
             )
         },
@@ -367,7 +367,7 @@ fun SearchBarStateless(
             Text(
                 modifier = Modifier.fillMaxWidth(),
                 text = label,
-                color = MaterialTheme.appColors.textSecondary,
+                color = MaterialTheme.appColors.textFieldHint,
                 style = MaterialTheme.appTypography.bodyMedium
             )
         },
@@ -1126,7 +1126,7 @@ fun NoContentScreen(message: String, icon: Painter) {
                 ),
             painter = icon,
             contentDescription = null,
-            tint = MaterialTheme.appColors.progressBarBackgroundColor,
+            tint = MaterialTheme.appColors.emptyStateIconColor,
         )
         Spacer(Modifier.height(24.dp))
         Text(
diff --git a/core/src/main/java/org/openedx/core/ui/theme/AppColors.kt b/core/src/main/java/org/openedx/core/ui/theme/AppColors.kt
index daf1e649e..9c90a0c19 100644
--- a/core/src/main/java/org/openedx/core/ui/theme/AppColors.kt
+++ b/core/src/main/java/org/openedx/core/ui/theme/AppColors.kt
@@ -11,6 +11,8 @@ data class AppColors(
     val textPrimaryLight: Color,
     val textHyperLink: Color,
     val textSecondary: Color,
+    val emptyStateIconColor: Color,
+    val secondaryContentColor: Color,
     val textDark: Color,
     val textAccent: Color,
     val textWarning: Color,
diff --git a/core/src/main/java/org/openedx/core/ui/theme/Theme.kt b/core/src/main/java/org/openedx/core/ui/theme/Theme.kt
index ec7997c72..c6933da69 100644
--- a/core/src/main/java/org/openedx/core/ui/theme/Theme.kt
+++ b/core/src/main/java/org/openedx/core/ui/theme/Theme.kt
@@ -42,6 +42,8 @@ private val DarkColorPalette = AppColors(
     textPrimaryVariant = dark_text_primary_variant,
     textPrimaryLight = dark_text_primary_light,
     textSecondary = dark_text_secondary,
+    emptyStateIconColor = dark_empty_state_icon_color,
+    secondaryContentColor = dark_secondary_content_color,
     textDark = dark_text_dark,
     textAccent = dark_text_accent,
     textWarning = dark_text_warning,
@@ -142,6 +144,8 @@ private val LightColorPalette = AppColors(
     textPrimaryVariant = light_text_primary_variant,
     textPrimaryLight = light_text_primary_light,
     textSecondary = light_text_secondary,
+    emptyStateIconColor = light_empty_state_icon_color,
+    secondaryContentColor = light_secondary_content_color,
     textDark = light_text_dark,
     textAccent = light_text_accent,
     textWarning = light_text_warning,
diff --git a/core/src/openedx/org/openedx/core/ui/theme/Colors.kt b/core/src/openedx/org/openedx/core/ui/theme/Colors.kt
index 309db959c..c757fe5a5 100644
--- a/core/src/openedx/org/openedx/core/ui/theme/Colors.kt
+++ b/core/src/openedx/org/openedx/core/ui/theme/Colors.kt
@@ -20,7 +20,9 @@ val light_info_variant = light_primary
 val light_text_primary = Color(0xFF212121)
 val light_text_primary_variant = Color(0xFF3D4964)
 val light_text_primary_light = light_text_primary
-val light_text_secondary = Color(0xFFB3B3B3)
+val light_text_secondary = Color(0xFF3D4964)
+val light_empty_state_icon_color = Color(0xFF3D4964)
+val light_secondary_content_color = Color(0xFF3D4964)
 val light_text_dark = Color(0xFF19212F)
 val light_text_accent = light_primary
 val light_text_warning = Color(0xFF19212F)
@@ -93,7 +95,9 @@ val dark_onError = Color.Black
 val dark_text_primary = Color.White
 val dark_text_primary_light = dark_text_primary
 val dark_text_primary_variant = Color.White
-val dark_text_secondary = Color(0xFFB3B3B3)
+val dark_text_secondary = Color(0xFF8E9BAE)
+val dark_empty_state_icon_color = Color(0xFF8E9BAE)
+val dark_secondary_content_color = Color(0xFF8E9BAE)
 val dark_text_dark = Color.White
 val dark_text_accent = Color(0xFF879FF5)
 val dark_text_warning = Color(0xFF19212F)
diff --git a/course/src/main/java/org/openedx/course/presentation/contenttab/ContentTabEmptyState.kt b/course/src/main/java/org/openedx/course/presentation/contenttab/ContentTabEmptyState.kt
index 6f98c0663..9db32a9a9 100644
--- a/course/src/main/java/org/openedx/course/presentation/contenttab/ContentTabEmptyState.kt
+++ b/course/src/main/java/org/openedx/course/presentation/contenttab/ContentTabEmptyState.kt
@@ -51,7 +51,7 @@ fun ContentTabEmptyState(
                     .size(120.dp),
                 painter = painterResource(R.drawable.course_ic_warning),
                 contentDescription = null,
-                tint = MaterialTheme.appColors.textFieldHint
+                tint = MaterialTheme.appColors.emptyStateIconColor
             )
             Spacer(Modifier.height(24.dp))
         }
diff --git a/course/src/main/java/org/openedx/course/presentation/handouts/HandoutsScreen.kt b/course/src/main/java/org/openedx/course/presentation/handouts/HandoutsScreen.kt
index 14d7a8072..a1bd0fdfd 100644
--- a/course/src/main/java/org/openedx/course/presentation/handouts/HandoutsScreen.kt
+++ b/course/src/main/java/org/openedx/course/presentation/handouts/HandoutsScreen.kt
@@ -135,7 +135,7 @@ private fun HandoutsItem(
                 Text(
                     text = description,
                     style = MaterialTheme.appTypography.labelSmall,
-                    color = MaterialTheme.appColors.textFieldHint
+                    color = MaterialTheme.appColors.textSecondary
                 )
             }
         }
diff --git a/course/src/main/java/org/openedx/course/presentation/offline/CourseOfflineScreen.kt b/course/src/main/java/org/openedx/course/presentation/offline/CourseOfflineScreen.kt
index b79cacd23..3d808cb95 100644
--- a/course/src/main/java/org/openedx/course/presentation/offline/CourseOfflineScreen.kt
+++ b/course/src/main/java/org/openedx/course/presentation/offline/CourseOfflineScreen.kt
@@ -441,13 +441,13 @@ private fun NoDownloadableBlocksProgress(
         Text(
             text = stringResource(R.string.core_0mb),
             style = MaterialTheme.appTypography.titleLarge,
-            color = MaterialTheme.appColors.textFieldHint
+            color = MaterialTheme.appColors.textSecondary
         )
         Spacer(modifier = Modifier.height(4.dp))
         IconText(
             text = stringResource(R.string.core_available_to_download),
             icon = Icons.Outlined.CloudDownload,
-            color = MaterialTheme.appColors.textFieldHint,
+            color = MaterialTheme.appColors.secondaryContentColor,
             textStyle = MaterialTheme.appTypography.labelLarge
         )
         Spacer(modifier = Modifier.height(20.dp))
diff --git a/dashboard/src/main/java/org/openedx/courses/presentation/AllEnrolledCoursesView.kt b/dashboard/src/main/java/org/openedx/courses/presentation/AllEnrolledCoursesView.kt
index 2a5245235..86d9bc77e 100644
--- a/dashboard/src/main/java/org/openedx/courses/presentation/AllEnrolledCoursesView.kt
+++ b/dashboard/src/main/java/org/openedx/courses/presentation/AllEnrolledCoursesView.kt
@@ -442,7 +442,7 @@ fun CourseItem(
                         .padding(horizontal = 8.dp)
                         .padding(top = 4.dp),
                     style = MaterialTheme.appTypography.labelMedium,
-                    color = MaterialTheme.appColors.textFieldHint,
+                    color = MaterialTheme.appColors.textSecondary,
                     overflow = TextOverflow.Ellipsis,
                     minLines = 1,
                     maxLines = 2,
@@ -519,7 +519,7 @@ fun EmptyState(
         ) {
             Icon(
                 painter = painterResource(id = R.drawable.core_ic_book),
-                tint = MaterialTheme.appColors.textFieldBorder,
+                tint = MaterialTheme.appColors.emptyStateIconColor,
                 contentDescription = null
             )
             Spacer(Modifier.height(4.dp))
diff --git a/dashboard/src/main/java/org/openedx/courses/presentation/DashboardGalleryView.kt b/dashboard/src/main/java/org/openedx/courses/presentation/DashboardGalleryView.kt
index 3a807c837..6efa72854 100644
--- a/dashboard/src/main/java/org/openedx/courses/presentation/DashboardGalleryView.kt
+++ b/dashboard/src/main/java/org/openedx/courses/presentation/DashboardGalleryView.kt
@@ -811,7 +811,7 @@ private fun PrimaryCourseTitle(
             modifier = Modifier.fillMaxWidth(),
             text = primaryCourse.course.org,
             style = MaterialTheme.appTypography.labelMedium,
-            color = MaterialTheme.appColors.textFieldHint
+            color = MaterialTheme.appColors.textSecondary
         )
         Text(
             modifier = Modifier
@@ -828,7 +828,7 @@ private fun PrimaryCourseTitle(
                 .fillMaxWidth()
                 .padding(top = 4.dp),
             style = MaterialTheme.appTypography.labelMedium,
-            color = MaterialTheme.appColors.textFieldHint,
+            color = MaterialTheme.appColors.textSecondary,
             text = TimeUtils.getCourseFormattedDate(
                 LocalContext.current,
                 Date(),
@@ -876,7 +876,7 @@ private fun NoCoursesInfo(
         ) {
             Icon(
                 painter = painterResource(id = CoreR.drawable.core_ic_book),
-                tint = MaterialTheme.appColors.textFieldBorder,
+                tint = MaterialTheme.appColors.emptyStateIconColor,
                 contentDescription = null
             )
             Spacer(Modifier.height(4.dp))
diff --git a/dashboard/src/main/java/org/openedx/dashboard/presentation/DashboardListFragment.kt b/dashboard/src/main/java/org/openedx/dashboard/presentation/DashboardListFragment.kt
index abbf2d784..7ff5c50b6 100644
--- a/dashboard/src/main/java/org/openedx/dashboard/presentation/DashboardListFragment.kt
+++ b/dashboard/src/main/java/org/openedx/dashboard/presentation/DashboardListFragment.kt
@@ -396,7 +396,7 @@ private fun CourseItem(
                 Text(
                     modifier = Modifier.testTag("txt_course_org"),
                     text = enrolledCourse.course.org,
-                    color = MaterialTheme.appColors.textFieldHint,
+                    color = MaterialTheme.appColors.textSecondary,
                     style = MaterialTheme.appTypography.labelMedium
                 )
                 Spacer(modifier = Modifier.height(4.dp))
@@ -432,7 +432,7 @@ private fun CourseItem(
                                 enrolledCourse.course.startType,
                                 enrolledCourse.course.startDisplay
                             ),
-                            color = MaterialTheme.appColors.textFieldHint,
+                            color = MaterialTheme.appColors.textSecondary,
                             style = MaterialTheme.appTypography.labelMedium
                         )
                         Box(
@@ -475,7 +475,7 @@ private fun EmptyState() {
             Icon(
                 painter = painterResource(id = R.drawable.dashboard_ic_empty),
                 contentDescription = null,
-                tint = MaterialTheme.appColors.textFieldBorder
+                tint = MaterialTheme.appColors.emptyStateIconColor
             )
             Spacer(Modifier.height(16.dp))
             Text(
diff --git a/dates/src/main/java/org/openedx/dates/presentation/dates/DatesScreen.kt b/dates/src/main/java/org/openedx/dates/presentation/dates/DatesScreen.kt
index c8bf3faa8..4ad4c287a 100644
--- a/dates/src/main/java/org/openedx/dates/presentation/dates/DatesScreen.kt
+++ b/dates/src/main/java/org/openedx/dates/presentation/dates/DatesScreen.kt
@@ -276,7 +276,7 @@ private fun EmptyState(
             Icon(
                 modifier = Modifier.size(100.dp),
                 imageVector = Icons.Outlined.CalendarMonth,
-                tint = MaterialTheme.appColors.textFieldBorder,
+                tint = MaterialTheme.appColors.emptyStateIconColor,
                 contentDescription = null
             )
             Spacer(Modifier.height(4.dp))
diff --git a/discovery/src/main/java/org/openedx/discovery/presentation/ui/DiscoveryUI.kt b/discovery/src/main/java/org/openedx/discovery/presentation/ui/DiscoveryUI.kt
index 19c9910be..3ce3f46f6 100644
--- a/discovery/src/main/java/org/openedx/discovery/presentation/ui/DiscoveryUI.kt
+++ b/discovery/src/main/java/org/openedx/discovery/presentation/ui/DiscoveryUI.kt
@@ -139,7 +139,7 @@ fun DiscoveryCourseItem(
                         .testTag("txt_course_org")
                         .padding(top = 12.dp),
                     text = course.org,
-                    color = MaterialTheme.appColors.textFieldHint,
+                    color = MaterialTheme.appColors.textSecondary,
                     style = MaterialTheme.appTypography.labelMedium
                 )
                 Text(
diff --git a/downloads/src/main/java/org/openedx/downloads/presentation/download/DownloadsScreen.kt b/downloads/src/main/java/org/openedx/downloads/presentation/download/DownloadsScreen.kt
index 140f8ebfd..1b8caa50c 100644
--- a/downloads/src/main/java/org/openedx/downloads/presentation/download/DownloadsScreen.kt
+++ b/downloads/src/main/java/org/openedx/downloads/presentation/download/DownloadsScreen.kt
@@ -523,7 +523,7 @@ private fun EmptyState(
         ) {
             Icon(
                 painter = painterResource(id = org.openedx.core.R.drawable.core_ic_book),
-                tint = MaterialTheme.appColors.textFieldBorder,
+                tint = MaterialTheme.appColors.emptyStateIconColor,
                 contentDescription = null
             )
             Spacer(Modifier.height(4.dp))
diff --git a/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSettingsView.kt b/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSettingsView.kt
index 842ea9373..118440378 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSettingsView.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSettingsView.kt
@@ -206,7 +206,7 @@ fun CalendarSyncSection(
                 Text(
                     text = stringResource(id = calendarSyncState.title),
                     style = MaterialTheme.appTypography.labelSmall,
-                    color = MaterialTheme.appColors.textFieldHint
+                    color = MaterialTheme.appColors.textSecondary
                 )
             }
             if (calendarSyncState == CalendarSyncState.SYNCHRONIZATION) {
diff --git a/profile/src/main/java/org/openedx/profile/presentation/calendar/CoursesToSyncFragment.kt b/profile/src/main/java/org/openedx/profile/presentation/calendar/CoursesToSyncFragment.kt
index 8dcb86a22..f81a5c58c 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/calendar/CoursesToSyncFragment.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/calendar/CoursesToSyncFragment.kt
@@ -366,7 +366,7 @@ private fun EmptyListState(
         Icon(
             modifier = Modifier.size(96.dp),
             painter = painterResource(id = coreR.drawable.core_ic_book),
-            tint = MaterialTheme.appColors.divider,
+            tint = MaterialTheme.appColors.emptyStateIconColor,
             contentDescription = null
         )
         Text(