diff --git a/app/src/main/kotlin/ferprieto/timelineview/view/UseCasesActivity.kt b/app/src/main/kotlin/ferprieto/timelineview/view/UseCasesActivity.kt
index 8ce8d5e..059b0da 100644
--- a/app/src/main/kotlin/ferprieto/timelineview/view/UseCasesActivity.kt
+++ b/app/src/main/kotlin/ferprieto/timelineview/view/UseCasesActivity.kt
@@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -114,7 +114,7 @@ fun UseCasesScreen() {
                     }
                 ) {
                     Icon(
-                        imageVector = Icons.Default.ArrowBack,
+                        imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                         contentDescription = stringResource(R.string.back),
                         tint = MaterialTheme.colorScheme.primary
                     )
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 43b7bf9..3eaddac 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 # SDK and Tools - Updated for Gradle 9.0.0 compatibility with Android Studio compatibility
 agp = "8.8.1"
-kotlin = "2.0.21"
+kotlin = "2.1.0"
 compileSdk = "36"
 minSdk = "21"
 targetSdk = "36"
@@ -12,7 +12,7 @@ git = "3.4.0"
 # Compose - Updated for better Kotlin 2.x compatibility
 composeBom = "2024.12.01"
 composeCompiler = "1.5.15"
-activityCompose = "1.8.2"
+activityCompose = "1.9.3"
 
 # AndroidX - Compatible with AGP 8.8.1  
 androidxCore = "1.15.0"
diff --git a/timelineview/build.gradle.kts b/timelineview/build.gradle.kts
index c20c951..d45955e 100644
--- a/timelineview/build.gradle.kts
+++ b/timelineview/build.gradle.kts
@@ -74,16 +74,16 @@ dependencies {
     testImplementation("org.jetbrains.kotlin:kotlin-test")
     
     // Android Instrumented Testing
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    androidTestImplementation("androidx.test.ext:junit:1.2.1")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
     androidTestImplementation(platform(libs.compose.bom))
     androidTestImplementation("androidx.compose.ui:ui-test-junit4")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
     
     // Compose Testing
     androidTestImplementation("androidx.compose.ui:ui-test")
-    androidTestImplementation("androidx.test:rules:1.5.0")
-    androidTestImplementation("androidx.test:runner:1.5.2")
+    androidTestImplementation("androidx.test:rules:1.6.1")
+    androidTestImplementation("androidx.test:runner:1.6.2")
 }
 
 // Force resolution of compatible AndroidX versions