diff --git a/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/CompositeUserNewsResourceRepositoryTest.kt b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/CompositeUserNewsResourceRepositoryTest.kt
index 9ed85d427..743fb7e5c 100644
--- a/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/CompositeUserNewsResourceRepositoryTest.kt
+++ b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/CompositeUserNewsResourceRepositoryTest.kt
@@ -163,7 +163,7 @@ private val sampleNewsResources = listOf(
         url = "https://youtu.be/-fJ6poHQrjM",
         headerImageUrl = "https://i.ytimg.com/vi/-fJ6poHQrjM/maxresdefault.jpg",
         publishDate = Instant.parse("2021-11-09T00:00:00.000Z"),
-        type = "Video",
+        type = "Video 📺",
         topics = listOf(sampleTopic1),
     ),
     NewsResource(
@@ -175,7 +175,7 @@ private val sampleNewsResources = listOf(
         url = "https://youtu.be/ZARz0pjm5YM",
         headerImageUrl = "https://i.ytimg.com/vi/ZARz0pjm5YM/maxresdefault.jpg",
         publishDate = Instant.parse("2021-11-01T00:00:00.000Z"),
-        type = "Video",
+        type = "Video 📺",
         topics = listOf(sampleTopic1, sampleTopic2),
     ),
     NewsResource(
@@ -185,7 +185,7 @@ private val sampleNewsResources = listOf(
         url = "https://youtu.be/r5JgIyS3t3s",
         headerImageUrl = "https://i.ytimg.com/vi/r5JgIyS3t3s/maxresdefault.jpg",
         publishDate = Instant.parse("2021-11-08T00:00:00.000Z"),
-        type = "Video",
+        type = "Video 📺",
         topics = listOf(sampleTopic2),
     ),
 )
diff --git a/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/UserNewsResourceTest.kt b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/UserNewsResourceTest.kt
index 9a6c00cda..a21dee863 100644
--- a/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/UserNewsResourceTest.kt
+++ b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/UserNewsResourceTest.kt
@@ -44,7 +44,7 @@ class UserNewsResourceTest {
             url = "Test URL",
             headerImageUrl = "Test image URL",
             publishDate = Clock.System.now(),
-            type = "Article",
+            type = "Article 📚",
             topics = listOf(
                 Topic(
                     id = "T1",
diff --git a/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/model/NetworkEntityKtTest.kt b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/model/NetworkEntityKtTest.kt
index f12f347b0..7dd251a99 100644
--- a/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/model/NetworkEntityKtTest.kt
+++ b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/model/NetworkEntityKtTest.kt
@@ -55,7 +55,7 @@ class NetworkEntityKtTest {
                 url = "url",
                 headerImageUrl = "headerImageUrl",
                 publishDate = Instant.fromEpochMilliseconds(1),
-                type = "Article",
+                type = "Article 📚",
             )
         val entity = networkModel.asEntity()
 
@@ -65,7 +65,7 @@ class NetworkEntityKtTest {
         assertEquals("url", entity.url)
         assertEquals("headerImageUrl", entity.headerImageUrl)
         assertEquals(Instant.fromEpochMilliseconds(1), entity.publishDate)
-        assertEquals("Article", entity.type)
+        assertEquals("Article 📚", entity.type)
 
         val expandedNetworkModel =
             NetworkNewsResourceExpanded(
@@ -75,7 +75,7 @@ class NetworkEntityKtTest {
                 url = "url",
                 headerImageUrl = "headerImageUrl",
                 publishDate = Instant.fromEpochMilliseconds(1),
-                type = "Article",
+                type = "Article 📚",
             )
 
         val entityFromExpanded = expandedNetworkModel.asEntity()
@@ -86,6 +86,6 @@ class NetworkEntityKtTest {
         assertEquals("url", entityFromExpanded.url)
         assertEquals("headerImageUrl", entityFromExpanded.headerImageUrl)
         assertEquals(Instant.fromEpochMilliseconds(1), entityFromExpanded.publishDate)
-        assertEquals("Article", entityFromExpanded.type)
+        assertEquals("Article 📚", entityFromExpanded.type)
     }
 }
diff --git a/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResourceKtTest.kt b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResourceKtTest.kt
index 95e13c5ec..a1b72c52f 100644
--- a/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResourceKtTest.kt
+++ b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResourceKtTest.kt
@@ -32,7 +32,7 @@ class PopulatedNewsResourceKtTest {
                 content = "Hilt",
                 url = "url",
                 headerImageUrl = "headerImageUrl",
-                type = "Video",
+                type = "Video 📺",
                 publishDate = Instant.fromEpochMilliseconds(1),
             ),
             topics = listOf(
@@ -55,7 +55,7 @@ class PopulatedNewsResourceKtTest {
                 content = "Hilt",
                 url = "url",
                 headerImageUrl = "headerImageUrl",
-                type = "Video",
+                type = "Video 📺",
                 publishDate = Instant.fromEpochMilliseconds(1),
                 topics = listOf(
                     Topic(
diff --git a/core/database/src/androidTest/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoTest.kt b/core/database/src/androidTest/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoTest.kt
index f02865fe9..55e817618 100644
--- a/core/database/src/androidTest/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoTest.kt
+++ b/core/database/src/androidTest/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoTest.kt
@@ -304,5 +304,5 @@ private fun testNewsResource(
     url = "",
     headerImageUrl = "",
     publishDate = Instant.fromEpochMilliseconds(millisSinceEpoch),
-    type = "DAC",
+    type = "Article 📚",
 )
diff --git a/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/data/NewsResourcesTestData.kt b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/data/NewsResourcesTestData.kt
index b4b3a6104..1e31c320f 100644
--- a/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/data/NewsResourcesTestData.kt
+++ b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/data/NewsResourcesTestData.kt
@@ -41,7 +41,7 @@ val newsResourcesTestData: List<NewsResource> = listOf(
         url = "https://youtu.be/-fJ6poHQrjM",
         headerImageUrl = "https://i.ytimg.com/vi/-fJ6poHQrjM/maxresdefault.jpg",
         publishDate = Instant.parse("2021-11-09T00:00:00.000Z"),
-        type = "Video",
+        type = "Video 📺",
         topics = listOf(topicsTestData[0], topicsTestData[1]),
     ),
     NewsResource(
@@ -54,7 +54,7 @@ val newsResourcesTestData: List<NewsResource> = listOf(
         url = "https://youtu.be/ZARz0pjm5YM",
         headerImageUrl = "https://i.ytimg.com/vi/ZARz0pjm5YM/maxresdefault.jpg",
         publishDate = Instant.parse("2021-11-01T00:00:00.000Z"),
-        type = "Video",
+        type = "Video 📺",
         topics = listOf(topicsTestData[2]),
     ),
     NewsResource(
diff --git a/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/data/UserNewsResourcesTestData.kt b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/data/UserNewsResourcesTestData.kt
index a3c5ec63c..ab6574f6a 100644
--- a/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/data/UserNewsResourcesTestData.kt
+++ b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/data/UserNewsResourcesTestData.kt
@@ -69,7 +69,7 @@ val userNewsResourcesTestData: List<UserNewsResource> = UserData(
                 url = "https://youtu.be/-fJ6poHQrjM",
                 headerImageUrl = "https://i.ytimg.com/vi/-fJ6poHQrjM/maxresdefault.jpg",
                 publishDate = Instant.parse("2021-11-09T00:00:00.000Z"),
-                type = "Video",
+                type = "Video 📺",
                 topics = topicsTestData.take(2),
             ),
             userData = userData,
@@ -85,7 +85,7 @@ val userNewsResourcesTestData: List<UserNewsResource> = UserData(
                 url = "https://youtu.be/ZARz0pjm5YM",
                 headerImageUrl = "https://i.ytimg.com/vi/ZARz0pjm5YM/maxresdefault.jpg",
                 publishDate = Instant.parse("2021-11-01T00:00:00.000Z"),
-                type = "Video",
+                type = "Video 📺",
                 topics = listOf(topicsTestData[2]),
             ),
             userData = userData,
diff --git a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/UserNewsResourcePreviewParameterProvider.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/UserNewsResourcePreviewParameterProvider.kt
index 979ec2321..493788314 100644
--- a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/UserNewsResourcePreviewParameterProvider.kt
+++ b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/UserNewsResourcePreviewParameterProvider.kt
@@ -111,7 +111,7 @@ object PreviewParameterData {
                 url = "https://youtu.be/-fJ6poHQrjM",
                 headerImageUrl = "https://i.ytimg.com/vi/-fJ6poHQrjM/maxresdefault.jpg",
                 publishDate = Instant.parse("2021-11-09T00:00:00.000Z"),
-                type = "Video",
+                type = "Video 📺",
                 topics = topics.take(2),
             ),
             userData = userData,
@@ -127,7 +127,7 @@ object PreviewParameterData {
                 url = "https://youtu.be/ZARz0pjm5YM",
                 headerImageUrl = "https://i.ytimg.com/vi/ZARz0pjm5YM/maxresdefault.jpg",
                 publishDate = Instant.parse("2021-11-01T00:00:00.000Z"),
-                type = "Video",
+                type = "Video 📺",
                 topics = listOf(topics[2]),
             ),
             userData = userData,
diff --git a/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt b/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt
index 7fb672fca..b75573975 100644
--- a/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt
+++ b/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt
@@ -544,7 +544,7 @@ private val sampleNewsResources = listOf(
         url = "https://youtu.be/-fJ6poHQrjM",
         headerImageUrl = "https://i.ytimg.com/vi/-fJ6poHQrjM/maxresdefault.jpg",
         publishDate = Instant.parse("2021-11-09T00:00:00.000Z"),
-        type = "Video",
+        type = "Video 📺",
         topics = listOf(
             Topic(
                 id = "0",
@@ -565,7 +565,7 @@ private val sampleNewsResources = listOf(
         url = "https://youtu.be/ZARz0pjm5YM",
         headerImageUrl = "https://i.ytimg.com/vi/ZARz0pjm5YM/maxresdefault.jpg",
         publishDate = Instant.parse("2021-11-01T00:00:00.000Z"),
-        type = "Video",
+        type = "Video 📺",
         topics = listOf(
             Topic(
                 id = "1",
@@ -584,7 +584,7 @@ private val sampleNewsResources = listOf(
         url = "https://youtu.be/r5JgIyS3t3s",
         headerImageUrl = "https://i.ytimg.com/vi/r5JgIyS3t3s/maxresdefault.jpg",
         publishDate = Instant.parse("2021-11-08T00:00:00.000Z"),
-        type = "Video",
+        type = "Video 📺",
         topics = listOf(
             Topic(
                 id = "1",
diff --git a/feature/topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt b/feature/topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt
index 878e86189..8c6253d60 100644
--- a/feature/topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt
+++ b/feature/topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt
@@ -257,7 +257,7 @@ private val sampleNewsResources = listOf(
         url = "https://youtu.be/-fJ6poHQrjM",
         headerImageUrl = "https://i.ytimg.com/vi/-fJ6poHQrjM/maxresdefault.jpg",
         publishDate = Instant.parse("2021-11-09T00:00:00.000Z"),
-        type = "Video",
+        type = "Video 📺",
         topics = listOf(
             Topic(
                 id = "0",