diff --git a/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/mappers/GraphToTable.kt b/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/mappers/GraphToTable.kt
index 39237667905..efe16591777 100644
--- a/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/mappers/GraphToTable.kt
+++ b/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/mappers/GraphToTable.kt
@@ -13,7 +13,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.stringResource
@@ -49,6 +48,7 @@ import org.dhis2.composetable.ui.TableSelection
 import org.dhis2.composetable.ui.TableTheme
 import org.dhis2.composetable.ui.compositions.LocalInteraction
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
+import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor
 import kotlin.math.roundToInt
 
 private const val LINE_LISTING_MAX_ROWS = 500
@@ -176,7 +176,7 @@ class GraphToTable {
                                     LINE_LISTING_MAX_ROWS,
                                 ),
                                 style = TextStyle(
-                                    color = Color(0xFF667685),
+                                    color = TextColor.OnSurfaceLight,
                                     fontSize = 10.sp,
                                     fontWeight = FontWeight.Normal,
                                     fontFamily = FontFamily(Font(org.dhis2.ui.R.font.roboto_regular)),