diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ddefe22c..4237f918 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(21)
+    jvmToolchain(17)
 }
 
 android {
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/common/Components.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/common/Components.kt
index b73a7ae6..73c042a0 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/common/Components.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/common/Components.kt
@@ -23,6 +23,7 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.Spacer
@@ -210,8 +211,9 @@ fun CardButton(onClick: () -> Unit, text: String, modifier: Modifier = Modifier)
         onClick = { onClick() }, colors = ButtonDefaults.buttonColors(
             containerColor = MaterialTheme.colorScheme.surfaceVariant,
             contentColor = MaterialTheme.colorScheme.onSurfaceVariant
-        ), shape = MaterialTheme.shapes.small, modifier = modifier
-    ) { Text(text = text, fontSize = 17.sp) }
+        ), shape = MaterialTheme.shapes.small, modifier = modifier,
+        contentPadding = PaddingValues(horizontal = 12.dp)
+    ) { Text(text = text, fontSize = 16.sp) }
 }
 
 @Composable
@@ -253,7 +255,7 @@ fun EmptyListCard(message: String) {
             modifier = Modifier.padding(32.dp)
         ) {
             Text(text = """¯\_(ツ)_/¯""", fontSize = 32.sp)
-            Text(text = stringResource(R.string.empty_list_message), fontSize = 21.sp)
+            Text(text = stringResource(R.string.empty_list_message), fontSize = 21.sp, textAlign = TextAlign.Center)
             Text(text = message, fontSize = 18.sp, textAlign = TextAlign.Center)
         }
     }
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarScreen.kt
index 8762c733..bb2d82a4 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarScreen.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarScreen.kt
@@ -179,7 +179,11 @@ private fun RadarScreen(uiState: RadarState, navigateUp: () -> Unit) {
                             modifier = Modifier.padding(32.dp)
                         ) {
                             Text(text = """¯\_(ツ)_/¯""", fontSize = 32.sp)
-                            Text(text = stringResource(R.string.empty_list_message), fontSize = 21.sp)
+                            Text(
+                                text = stringResource(R.string.empty_list_message),
+                                fontSize = 21.sp,
+                                textAlign = TextAlign.Center
+                            )
                             Text(
                                 text = stringResource(R.string.radar_no_data),
                                 fontSize = 18.sp,
@@ -263,7 +267,11 @@ private fun RadarScreen(uiState: RadarState, navigateUp: () -> Unit) {
                                 modifier = Modifier.padding(32.dp)
                             ) {
                                 Text(text = """¯\_(ツ)_/¯""", fontSize = 32.sp)
-                                Text(text = stringResource(R.string.empty_list_message), fontSize = 21.sp)
+                                Text(
+                                    text = stringResource(R.string.empty_list_message),
+                                    fontSize = 21.sp,
+                                    textAlign = TextAlign.Center
+                                )
                                 Text(
                                     text = stringResource(R.string.radar_no_data),
                                     fontSize = 18.sp,
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
index be774419..4e8ebf1e 100644
--- a/data/build.gradle.kts
+++ b/data/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(21)
+    jvmToolchain(17)
 }
 
 android {
diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
index 219df703..ec7d293c 100644
--- a/domain/build.gradle.kts
+++ b/domain/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(21)
+    jvmToolchain(17)
 }
 
 dependencies {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b182666a..ff2c997a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 android-gradle-plugin = "9.0.0"
 google-ksp = "2.3.2"
-kotlin = "2.3.0"
+kotlin = "2.3.10"
 
 androidx-core-ktx = "1.17.0"
 androidx-core-splashscreen = "1.2.0"