diff --git a/app/src/androidTest/java/com/bnyro/clock/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/bnyro/clock/ExampleInstrumentedTest.kt
index fb284b60..af4a43a0 100644
--- a/app/src/androidTest/java/com/bnyro/clock/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/bnyro/clock/ExampleInstrumentedTest.kt
@@ -2,7 +2,7 @@ package com.bnyro.clock
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
diff --git a/app/src/main/java/com/bnyro/clock/presentation/components/SwitchWithDivider.kt b/app/src/main/java/com/bnyro/clock/presentation/components/SwitchWithDivider.kt
index ad4690fa..7ee65754 100644
--- a/app/src/main/java/com/bnyro/clock/presentation/components/SwitchWithDivider.kt
+++ b/app/src/main/java/com/bnyro/clock/presentation/components/SwitchWithDivider.kt
@@ -10,7 +10,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.selection.toggleable
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
@@ -67,7 +67,7 @@ fun SwitchWithDivider(
                     )
                 }
             }
-            Divider(
+            HorizontalDivider(
                 modifier = Modifier
                     .height(32.dp)
                     .padding(horizontal = 8.dp)
diff --git a/app/src/main/java/com/bnyro/clock/presentation/screens/settings/SettingsScreen.kt b/app/src/main/java/com/bnyro/clock/presentation/screens/settings/SettingsScreen.kt
index aa7afcf6..5b19c9f9 100644
--- a/app/src/main/java/com/bnyro/clock/presentation/screens/settings/SettingsScreen.kt
+++ b/app/src/main/java/com/bnyro/clock/presentation/screens/settings/SettingsScreen.kt
@@ -10,8 +10,8 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.History
 import androidx.compose.material.icons.filled.OpenInNew
-import androidx.compose.material3.Divider
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.LargeTopAppBar
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
@@ -21,13 +21,11 @@ import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.bnyro.clock.BuildConfig
 import com.bnyro.clock.R
-import com.bnyro.clock.navigation.HomeRoutes
 import com.bnyro.clock.navigation.homeRoutes
 import com.bnyro.clock.presentation.components.ClickableIcon
 import com.bnyro.clock.presentation.screens.settings.components.ButtonGroupPref
@@ -109,7 +107,7 @@ fun SettingsScreen(
                     }
                 )
             }
-            Divider(
+            HorizontalDivider(
                 modifier = Modifier.padding(top = 12.dp, bottom = 8.dp),
                 color = MaterialTheme.colorScheme.surfaceVariant
             )
@@ -142,7 +140,7 @@ fun SettingsScreen(
                 title = stringResource(R.string.show_timer_quick_selection),
                 defaultValue = true
             )
-            Divider(
+            HorizontalDivider(
                 modifier = Modifier.padding(top = 12.dp, bottom = 8.dp),
                 color = MaterialTheme.colorScheme.surfaceVariant
             )
diff --git a/app/src/main/java/com/bnyro/clock/presentation/screens/stopwatch/StopwatchScreen.kt b/app/src/main/java/com/bnyro/clock/presentation/screens/stopwatch/StopwatchScreen.kt
index c782c8d1..5f6a14ab 100644
--- a/app/src/main/java/com/bnyro/clock/presentation/screens/stopwatch/StopwatchScreen.kt
+++ b/app/src/main/java/com/bnyro/clock/presentation/screens/stopwatch/StopwatchScreen.kt
@@ -29,8 +29,8 @@ import androidx.compose.material.icons.filled.PlayArrow
 import androidx.compose.material.icons.filled.Stop
 import androidx.compose.material.icons.filled.Timer
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.Divider
 import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.LargeFloatingActionButton
 import androidx.compose.material3.MaterialTheme
@@ -236,7 +236,7 @@ private fun LapTable(
                         style = MaterialTheme.typography.titleMedium
                     )
                 }
-                Divider()
+                HorizontalDivider()
             }
         }
         itemsIndexed(stopwatchModel.rememberedTimeStamps) { index, time ->
diff --git a/app/src/test/java/com/bnyro/clock/ExampleUnitTest.kt b/app/src/test/java/com/bnyro/clock/ExampleUnitTest.kt
index d6b668df..83ced9fa 100644
--- a/app/src/test/java/com/bnyro/clock/ExampleUnitTest.kt
+++ b/app/src/test/java/com/bnyro/clock/ExampleUnitTest.kt
@@ -1,6 +1,6 @@
 package com.bnyro.clock
 
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
 import org.junit.Test
 
 /**