diff --git a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/examples/ExamplesHome.kt b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/examples/ExamplesHome.kt
index a68686953..32bc1eb5f 100644
--- a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/examples/ExamplesHome.kt
+++ b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/examples/ExamplesHome.kt
@@ -11,7 +11,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.Card
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -91,7 +91,7 @@ private fun ListStreamView(
                     )
 
                     if (index < playlist.items.lastIndex) {
-                        Divider()
+                        HorizontalDivider()
                     }
                 }
             }
diff --git a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/lists/ListsHome.kt b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/lists/ListsHome.kt
index fd1cefa63..dc581f94f 100644
--- a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/lists/ListsHome.kt
+++ b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/lists/ListsHome.kt
@@ -10,7 +10,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -149,7 +149,7 @@ private fun ListsHome(onContentSelected: (ContentList) -> Unit) {
                     )
 
                     if (index < section.contentList.lastIndex) {
-                        Divider()
+                        HorizontalDivider()
                     }
                 }
             }
diff --git a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/lists/ListsSubSection.kt b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/lists/ListsSubSection.kt
index e4a9cd84f..ab8bb2d91 100644
--- a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/lists/ListsSubSection.kt
+++ b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/lists/ListsSubSection.kt
@@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -114,7 +114,7 @@ fun ListsSubSection(
                         )
 
                         if (index < items.itemCount - 1) {
-                            Divider()
+                            HorizontalDivider()
                         }
                     }
                 }
diff --git a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/player/playlist/MediaItemLibrary.kt b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/player/playlist/MediaItemLibrary.kt
index 60f2d48bd..44e5e6c4f 100644
--- a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/player/playlist/MediaItemLibrary.kt
+++ b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/player/playlist/MediaItemLibrary.kt
@@ -15,7 +15,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Button
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.RadioButton
 import androidx.compose.material3.Surface
@@ -94,7 +94,7 @@ private fun DialogContent(
             text = "Add to the playlist",
             style = MaterialTheme.typography.headlineMedium
         )
-        Divider()
+        HorizontalDivider()
         LazyColumn(
             modifier = Modifier
                 .weight(0.5f)
@@ -113,7 +113,7 @@ private fun DialogContent(
                 )
             }
         }
-        Divider()
+        HorizontalDivider()
         Row(
             modifier = Modifier.fillMaxWidth(),
             horizontalArrangement = Arrangement.SpaceBetween
diff --git a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/player/settings/PlaybackSpeedSettings.kt b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/player/settings/PlaybackSpeedSettings.kt
index 24e76154c..7da112aac 100644
--- a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/player/settings/PlaybackSpeedSettings.kt
+++ b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/player/settings/PlaybackSpeedSettings.kt
@@ -9,7 +9,7 @@ import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.selection.toggleable
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.Text
@@ -44,7 +44,7 @@ fun PlaybackSpeedSettings(
             )
 
             if (index < playbackSpeeds.lastIndex) {
-                Divider()
+                HorizontalDivider()
             }
         }
     }
diff --git a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/player/settings/TrackSelectionSettings.kt b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/player/settings/TrackSelectionSettings.kt
index d98a1d70a..eaabc7414 100644
--- a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/player/settings/TrackSelectionSettings.kt
+++ b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/player/settings/TrackSelectionSettings.kt
@@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.HearingDisabled
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.Text
@@ -63,7 +63,7 @@ fun TrackSelectionSettings(
                     )
                 }
             )
-            Divider()
+            HorizontalDivider()
         }
         item {
             SettingsOption(
@@ -74,7 +74,7 @@ fun TrackSelectionSettings(
                     Text(text = stringResource(R.string.disabled))
                 }
             )
-            Divider()
+            HorizontalDivider()
         }
         tracksSetting.tracks.forEach { group ->
             items(group.length) { trackIndex ->
@@ -117,7 +117,7 @@ fun TrackSelectionSettings(
                 )
             }
             item {
-                Divider()
+                HorizontalDivider()
             }
         }
     }
diff --git a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/search/SearchHome.kt b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/search/SearchHome.kt
index eeab8f564..b1a5951d3 100644
--- a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/search/SearchHome.kt
+++ b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/search/SearchHome.kt
@@ -31,10 +31,10 @@ import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.ExpandMore
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.Divider
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -165,7 +165,7 @@ private fun SearchResultList(
                             )
 
                             if (index < items.itemCount - 1) {
-                                Divider()
+                                HorizontalDivider()
                             }
                         }
                     }
diff --git a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/showcases/ShowcasesHome.kt b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/showcases/ShowcasesHome.kt
index 4a9141d27..5fb60177a 100644
--- a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/showcases/ShowcasesHome.kt
+++ b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/showcases/ShowcasesHome.kt
@@ -10,7 +10,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
@@ -70,7 +70,7 @@ fun ShowcasesHome(navController: NavController) {
                 onClick = { navController.navigate(NavigationRoutes.simplePlayer) }
             )
 
-            Divider()
+            HorizontalDivider()
 
             DemoListItemView(
                 title = stringResource(R.string.story),
@@ -93,7 +93,7 @@ fun ShowcasesHome(navController: NavController) {
                 )
 
                 if (index < playlists.lastIndex) {
-                    Divider()
+                    HorizontalDivider()
                 }
             }
         }
@@ -112,7 +112,7 @@ fun ShowcasesHome(navController: NavController) {
                 )
             }
 
-            Divider()
+            HorizontalDivider()
 
             DemoListItemView(
                 title = stringResource(R.string.auto),
@@ -140,7 +140,7 @@ fun ShowcasesHome(navController: NavController) {
                 }
             )
 
-            Divider()
+            HorizontalDivider()
 
             DemoListItemView(
                 title = stringResource(R.string.adaptive),
@@ -148,14 +148,14 @@ fun ShowcasesHome(navController: NavController) {
                 onClick = { navController.navigate(NavigationRoutes.adaptive) }
             )
 
-            Divider()
+            HorizontalDivider()
 
             DemoListItemView(
                 title = stringResource(R.string.player_swap),
                 modifier = itemModifier,
                 onClick = { navController.navigate(NavigationRoutes.playerSwap) }
             )
-            Divider()
+            HorizontalDivider()
 
             DemoListItemView(
                 title = stringResource(R.string.tracker_example),
@@ -163,7 +163,7 @@ fun ShowcasesHome(navController: NavController) {
                 onClick = { navController.navigate(NavigationRoutes.trackingSample) }
             )
 
-            Divider()
+            HorizontalDivider()
 
             DemoListItemView(
                 title = stringResource(R.string.update_media_item_example),
@@ -175,7 +175,7 @@ fun ShowcasesHome(navController: NavController) {
                 }
             )
 
-            Divider()
+            HorizontalDivider()
 
             DemoListItemView(
                 title = stringResource(R.string.smooth_seeking_example),
@@ -187,7 +187,7 @@ fun ShowcasesHome(navController: NavController) {
                 }
             )
 
-            Divider()
+            HorizontalDivider()
 
             DemoListItemView(
                 title = stringResource(R.string.video_360),