diff --git a/feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreen.kt b/feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreen.kt
index 28d8e6291..74c72624d 100644
--- a/feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreen.kt
+++ b/feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreen.kt
@@ -34,11 +34,9 @@ import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons.Filled
 import androidx.compose.material.icons.filled.ArrowBack
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -46,7 +44,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -232,7 +229,6 @@ private fun AuthorToolbar(
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Preview(name = "phone", device = "spec:shape=Normal,width=360,height=640,unit=dp,dpi=480")
 @Preview(name = "landscape", device = "spec:shape=Normal,width=640,height=360,unit=dp,dpi=480")
 @Preview(name = "foldable", device = "spec:shape=Normal,width=673,height=841,unit=dp,dpi=480")
@@ -241,23 +237,16 @@ private fun AuthorToolbar(
 fun AuthorScreenPopulated() {
     NiaTheme {
         NiaBackground {
-            Scaffold(
-                containerColor = Color.Transparent,
-                contentColor = MaterialTheme.colorScheme.onBackground,
-            ) { padding ->
-                AuthorScreen(
-                    authorState = AuthorUiState.Success(FollowableAuthor(previewAuthors[0], false)),
-                    newsState = NewsUiState.Success(previewNewsResources),
-                    onBackClick = {},
-                    onFollowClick = {},
-                    modifier = Modifier.padding(padding)
-                )
-            }
+            AuthorScreen(
+                authorState = AuthorUiState.Success(FollowableAuthor(previewAuthors[0], false)),
+                newsState = NewsUiState.Success(previewNewsResources),
+                onBackClick = {},
+                onFollowClick = {}
+            )
         }
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Preview(name = "phone", device = "spec:shape=Normal,width=360,height=640,unit=dp,dpi=480")
 @Preview(name = "landscape", device = "spec:shape=Normal,width=640,height=360,unit=dp,dpi=480")
 @Preview(name = "foldable", device = "spec:shape=Normal,width=673,height=841,unit=dp,dpi=480")
@@ -266,18 +255,12 @@ fun AuthorScreenPopulated() {
 fun AuthorScreenLoading() {
     NiaTheme {
         NiaBackground {
-            Scaffold(
-                containerColor = Color.Transparent,
-                contentColor = MaterialTheme.colorScheme.onBackground,
-            ) { padding ->
-                AuthorScreen(
-                    authorState = AuthorUiState.Loading,
-                    newsState = NewsUiState.Loading,
-                    onBackClick = {},
-                    onFollowClick = {},
-                    modifier = Modifier.padding(padding)
-                )
-            }
+            AuthorScreen(
+                authorState = AuthorUiState.Loading,
+                newsState = NewsUiState.Loading,
+                onBackClick = {},
+                onFollowClick = {}
+            )
         }
     }
 }
diff --git a/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt b/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt
index c47a0513e..fa47eb26e 100644
--- a/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt
+++ b/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt
@@ -27,16 +27,12 @@ import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.filled.Search
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -176,7 +172,6 @@ private fun InterestsEmptyScreen() {
     Text(text = stringResource(id = R.string.interests_empty_header))
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Preview(name = "phone", device = "spec:shape=Normal,width=360,height=640,unit=dp,dpi=480")
 @Preview(name = "landscape", device = "spec:shape=Normal,width=640,height=360,unit=dp,dpi=480")
 @Preview(name = "foldable", device = "spec:shape=Normal,width=673,height=841,unit=dp,dpi=480")
@@ -185,32 +180,25 @@ private fun InterestsEmptyScreen() {
 fun InterestsScreenPopulated() {
     NiaTheme {
         NiaBackground {
-            Scaffold(
-                containerColor = Color.Transparent,
-                contentColor = MaterialTheme.colorScheme.onBackground,
-            ) { padding ->
-                InterestsScreen(
-                    uiState = InterestsUiState.Interests(
-                        authors = previewAuthors.map { FollowableAuthor(it, false) },
-                        topics = previewTopics.map { FollowableTopic(it, false) }
-                    ),
-                    tabState = InterestsTabState(
-                        titles = listOf(R.string.interests_topics, R.string.interests_people),
-                        currentIndex = 0
-                    ),
-                    followAuthor = { _, _ -> },
-                    followTopic = { _, _ -> },
-                    navigateToAuthor = {},
-                    navigateToTopic = {},
-                    switchTab = {},
-                    modifier = Modifier.padding(padding)
-                )
-            }
+            InterestsScreen(
+                uiState = InterestsUiState.Interests(
+                    authors = previewAuthors.map { FollowableAuthor(it, false) },
+                    topics = previewTopics.map { FollowableTopic(it, false) }
+                ),
+                tabState = InterestsTabState(
+                    titles = listOf(R.string.interests_topics, R.string.interests_people),
+                    currentIndex = 0
+                ),
+                followAuthor = { _, _ -> },
+                followTopic = { _, _ -> },
+                navigateToAuthor = {},
+                navigateToTopic = {},
+                switchTab = {}
+            )
         }
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Preview(name = "phone", device = "spec:shape=Normal,width=360,height=640,unit=dp,dpi=480")
 @Preview(name = "landscape", device = "spec:shape=Normal,width=640,height=360,unit=dp,dpi=480")
 @Preview(name = "foldable", device = "spec:shape=Normal,width=673,height=841,unit=dp,dpi=480")
@@ -219,29 +207,22 @@ fun InterestsScreenPopulated() {
 fun InterestsScreenLoading() {
     NiaTheme {
         NiaBackground {
-            Scaffold(
-                containerColor = Color.Transparent,
-                contentColor = MaterialTheme.colorScheme.onBackground,
-            ) { padding ->
-                InterestsScreen(
-                    uiState = InterestsUiState.Loading,
-                    tabState = InterestsTabState(
-                        titles = listOf(R.string.interests_topics, R.string.interests_people),
-                        currentIndex = 0
-                    ),
-                    followAuthor = { _, _ -> },
-                    followTopic = { _, _ -> },
-                    navigateToAuthor = {},
-                    navigateToTopic = {},
-                    switchTab = {},
-                    modifier = Modifier.padding(padding)
-                )
-            }
+            InterestsScreen(
+                uiState = InterestsUiState.Loading,
+                tabState = InterestsTabState(
+                    titles = listOf(R.string.interests_topics, R.string.interests_people),
+                    currentIndex = 0
+                ),
+                followAuthor = { _, _ -> },
+                followTopic = { _, _ -> },
+                navigateToAuthor = {},
+                navigateToTopic = {},
+                switchTab = {},
+            )
         }
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Preview(name = "phone", device = "spec:shape=Normal,width=360,height=640,unit=dp,dpi=480")
 @Preview(name = "landscape", device = "spec:shape=Normal,width=640,height=360,unit=dp,dpi=480")
 @Preview(name = "foldable", device = "spec:shape=Normal,width=673,height=841,unit=dp,dpi=480")
@@ -250,24 +231,18 @@ fun InterestsScreenLoading() {
 fun InterestsScreenEmpty() {
     NiaTheme {
         NiaBackground {
-            Scaffold(
-                containerColor = Color.Transparent,
-                contentColor = MaterialTheme.colorScheme.onBackground,
-            ) { padding ->
-                InterestsScreen(
-                    uiState = InterestsUiState.Empty,
-                    tabState = InterestsTabState(
-                        titles = listOf(R.string.interests_topics, R.string.interests_people),
-                        currentIndex = 0
-                    ),
-                    followAuthor = { _, _ -> },
-                    followTopic = { _, _ -> },
-                    navigateToAuthor = {},
-                    navigateToTopic = {},
-                    switchTab = {},
-                    modifier = Modifier.padding(padding)
-                )
-            }
+            InterestsScreen(
+                uiState = InterestsUiState.Empty,
+                tabState = InterestsTabState(
+                    titles = listOf(R.string.interests_topics, R.string.interests_people),
+                    currentIndex = 0
+                ),
+                followAuthor = { _, _ -> },
+                followTopic = { _, _ -> },
+                navigateToAuthor = {},
+                navigateToTopic = {},
+                switchTab = {}
+            )
         }
     }
 }
diff --git a/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt b/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt
index 6bd363e6a..3cb99d67e 100644
--- a/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt
+++ b/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt
@@ -34,18 +34,15 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material.icons.Icons.Filled
 import androidx.compose.material.icons.filled.ArrowBack
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -230,7 +227,6 @@ private fun TopicToolbar(
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Preview(name = "phone", device = "spec:shape=Normal,width=360,height=640,unit=dp,dpi=480")
 @Preview(name = "landscape", device = "spec:shape=Normal,width=640,height=360,unit=dp,dpi=480")
 @Preview(name = "foldable", device = "spec:shape=Normal,width=673,height=841,unit=dp,dpi=480")
@@ -239,23 +235,16 @@ private fun TopicToolbar(
 fun TopicScreenPopulated() {
     NiaTheme {
         NiaBackground {
-            Scaffold(
-                containerColor = Color.Transparent,
-                contentColor = MaterialTheme.colorScheme.onBackground,
-            ) { padding ->
-                TopicScreen(
-                    topicState = TopicUiState.Success(FollowableTopic(previewTopics[0], false)),
-                    newsState = NewsUiState.Success(previewNewsResources),
-                    onBackClick = {},
-                    onFollowClick = {},
-                    modifier = Modifier.padding(padding)
-                )
-            }
+            TopicScreen(
+                topicState = TopicUiState.Success(FollowableTopic(previewTopics[0], false)),
+                newsState = NewsUiState.Success(previewNewsResources),
+                onBackClick = {},
+                onFollowClick = {}
+            )
         }
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Preview(name = "phone", device = "spec:shape=Normal,width=360,height=640,unit=dp,dpi=480")
 @Preview(name = "landscape", device = "spec:shape=Normal,width=640,height=360,unit=dp,dpi=480")
 @Preview(name = "foldable", device = "spec:shape=Normal,width=673,height=841,unit=dp,dpi=480")
@@ -264,18 +253,12 @@ fun TopicScreenPopulated() {
 fun TopicScreenLoading() {
     NiaTheme {
         NiaBackground {
-            Scaffold(
-                containerColor = Color.Transparent,
-                contentColor = MaterialTheme.colorScheme.onBackground,
-            ) { padding ->
-                TopicScreen(
-                    topicState = TopicUiState.Loading,
-                    newsState = NewsUiState.Loading,
-                    onBackClick = {},
-                    onFollowClick = {},
-                    modifier = Modifier.padding(padding)
-                )
-            }
+            TopicScreen(
+                topicState = TopicUiState.Loading,
+                newsState = NewsUiState.Loading,
+                onBackClick = {},
+                onFollowClick = {}
+            )
         }
     }
 }