diff --git a/app/src/androidTest/java/org/dhis2/usescases/searchte/robot/SearchTeiRobot.kt b/app/src/androidTest/java/org/dhis2/usescases/searchte/robot/SearchTeiRobot.kt
index 6713922c09..343db8ad21 100644
--- a/app/src/androidTest/java/org/dhis2/usescases/searchte/robot/SearchTeiRobot.kt
+++ b/app/src/androidTest/java/org/dhis2/usescases/searchte/robot/SearchTeiRobot.kt
@@ -31,6 +31,7 @@ import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.CoreMatchers.not
 import org.hisp.dhis.mobile.ui.designsystem.component.AdditionalInfoItem
 import org.hisp.dhis.mobile.ui.designsystem.component.ListCard
+import org.hisp.dhis.mobile.ui.designsystem.component.ListCardTitleModel
 
 
 fun searchTeiRobot(searchTeiRobot: SearchTeiRobot.() -> Unit) {
@@ -186,7 +187,7 @@ class SearchTeiRobot : BaseRobot() {
 
         composeTestRule.setContent {
             ListCard(
-                title = title,
+                title = ListCardTitleModel(text = title),
                 additionalInfoList = displayedAttributes,
                 onCardClick = { }
             )
diff --git a/app/src/main/java/org/dhis2/usescases/datasets/datasetDetail/datasetList/DataSetListAdapter.kt b/app/src/main/java/org/dhis2/usescases/datasets/datasetDetail/datasetList/DataSetListAdapter.kt
index ba611acf5e..d7ed9797e9 100644
--- a/app/src/main/java/org/dhis2/usescases/datasets/datasetDetail/datasetList/DataSetListAdapter.kt
+++ b/app/src/main/java/org/dhis2/usescases/datasets/datasetDetail/datasetList/DataSetListAdapter.kt
@@ -12,6 +12,7 @@ import org.dhis2.databinding.ItemDatasetBinding
 import org.dhis2.usescases.datasets.datasetDetail.DataSetDetailModel
 import org.dhis2.usescases.datasets.datasetDetail.datasetList.mapper.DatasetCardMapper
 import org.hisp.dhis.mobile.ui.designsystem.component.ListCard
+import org.hisp.dhis.mobile.ui.designsystem.component.ListCardTitleModel
 
 class DataSetListAdapter(
     val viewModel: DataSetListViewModel,
@@ -49,7 +50,7 @@ class DataSetListAdapter(
                 )
                 ListCard(
                     listAvatar = card.avatar,
-                    title = card.title,
+                    title = ListCardTitleModel(text = card.title),
                     lastUpdated = card.lastUpdated,
                     additionalInfoList = card.additionalInfo,
                     actionButton = card.actionButton,
diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailLiveAdapter.kt b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailLiveAdapter.kt
index 0a820d8993..5bf68ccd12 100644
--- a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailLiveAdapter.kt
+++ b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailLiveAdapter.kt
@@ -16,6 +16,7 @@ import org.dhis2.usescases.programEventDetail.eventList.ui.mapper.EventCardMappe
 import org.dhis2.usescases.teiDashboard.dashboardfragments.teidata.teievents.EventViewHolder
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.mobile.ui.designsystem.component.ListCard
+import org.hisp.dhis.mobile.ui.designsystem.component.ListCardTitleModel
 
 class ProgramEventDetailLiveAdapter(
     private val program: Program,
@@ -65,7 +66,7 @@ class ProgramEventDetailLiveAdapter(
                 )
                 ListCard(
                     listAvatar = card.avatar,
-                    title = card.title,
+                    title = ListCardTitleModel(text = card.title),
                     lastUpdated = card.lastUpdated,
                     additionalInfoList = card.additionalInfo,
                     actionButton = card.actionButton,
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/SearchTeiLiveAdapter.kt b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/SearchTeiLiveAdapter.kt
index 3769edd2cf..5eb90556d9 100644
--- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/SearchTeiLiveAdapter.kt
+++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/SearchTeiLiveAdapter.kt
@@ -14,6 +14,7 @@ import org.dhis2.databinding.ItemSearchErrorBinding
 import org.dhis2.databinding.ItemSearchTrackedEntityBinding
 import org.dhis2.usescases.searchTrackEntity.ui.mapper.TEICardMapper
 import org.hisp.dhis.mobile.ui.designsystem.component.ListCard
+import org.hisp.dhis.mobile.ui.designsystem.component.ListCardTitleModel
 
 class SearchTeiLiveAdapter(
     private val fromRelationship: Boolean,
@@ -101,7 +102,7 @@ class SearchTeiLiveAdapter(
                         )
                         ListCard(
                             listAvatar = card.avatar,
-                            title = card.title,
+                            title = ListCardTitleModel(text = card.title),
                             lastUpdated = card.lastUpdated,
                             additionalInfoList = card.additionalInfo,
                             actionButton = card.actionButton,
diff --git a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/CheckBoxProvider.kt b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/CheckBoxProvider.kt
index 59fe4cc758..84333f9865 100644
--- a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/CheckBoxProvider.kt
+++ b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/CheckBoxProvider.kt
@@ -27,7 +27,7 @@ internal fun ProvideCheckBoxInput(
             uid = option.uid(),
             checked = fieldUiModel.displayName == option.displayName(),
             enabled = true,
-            textInput = option.displayName(),
+            textInput = option.displayName() ?: "",
         )
     } ?: emptyList()
 
diff --git a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/RadioButtonProvider.kt b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/RadioButtonProvider.kt
index 1bc114e682..3bfe01c0d8 100644
--- a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/RadioButtonProvider.kt
+++ b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/RadioButtonProvider.kt
@@ -26,7 +26,7 @@ internal fun ProvideRadioButtonInput(
             uid = option.uid(),
             selected = fieldUiModel.displayName == option.displayName(),
             enabled = true,
-            textInput = option.displayName(),
+            textInput = option.displayName() ?: "",
         )
     } ?: emptyList()
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5f98712634..06b1bb0691 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ kotlin = '1.9.21'
 hilt = '2.47'
 hiltCompiler = '1.0.0'
 jacoco = '0.8.10'
-designSystem = "0.2-20240206.071329-16"
+designSystem = "0.2-20240208.105715-18"
 dhis2sdk = "1.10.0-20240129.132841-8"
 ruleEngine = "2.1.9"
 appcompat = "1.6.1"