diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6c63743..3ebe536 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Snowflake">
+        android:theme="@style/Theme.Snowflake.Splash">
         <activity
             android:name=".ui.MainActivity"
             android:exported="true"
diff --git a/app/src/main/java/io/bloco/snowflake/ui/MainActivity.kt b/app/src/main/java/io/bloco/snowflake/ui/MainActivity.kt
index c6a0397..8e3d79c 100644
--- a/app/src/main/java/io/bloco/snowflake/ui/MainActivity.kt
+++ b/app/src/main/java/io/bloco/snowflake/ui/MainActivity.kt
@@ -25,6 +25,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.core.net.toUri
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.compose.rememberNavController
@@ -36,6 +37,7 @@ class MainActivity : ComponentActivity() {
     private val dependencies by lazy { (applicationContext as App).dependencies }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        installSplashScreen()
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
 
diff --git a/app/src/main/java/io/bloco/snowflake/ui/home/HomeScreen.kt b/app/src/main/java/io/bloco/snowflake/ui/home/HomeScreen.kt
index cd7ec7d..a526f8f 100644
--- a/app/src/main/java/io/bloco/snowflake/ui/home/HomeScreen.kt
+++ b/app/src/main/java/io/bloco/snowflake/ui/home/HomeScreen.kt
@@ -232,7 +232,9 @@ private fun Stats(
                 } else {
                     stringResource(R.string.snowflake_looking_to_help)
                 }
-            } else null,
+            } else {
+                null
+            },
         )
         StatsCell(
             title = stringResource(R.string.snowflake_stats_connections),
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
new file mode 100644
index 0000000..265acd1
--- /dev/null
+++ b/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.Snowflake.Splash" parent="Theme.SplashScreen.IconBackground">
+        <item name="windowSplashScreenBackground">#FF000000</item>
+        <item name="postSplashScreenTheme">@style/Theme.Snowflake</item>
+    </style>
+    <style name="Theme.Snowflake" parent="android:Theme.Material.NoActionBar" />
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index e0793d3..723fc2e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <style name="Theme.Snowflake.Splash" parent="Theme.SplashScreen.IconBackground">
+        <item name="windowSplashScreenBackground">#FFF5EDDD</item>
+        <item name="postSplashScreenTheme">@style/Theme.Snowflake</item>
+    </style>
     <style name="Theme.Snowflake" parent="android:Theme.Material.Light.NoActionBar" />
-</resources>
\ No newline at end of file
+</resources>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 96a6814..0bd3bb0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -36,6 +36,7 @@ androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-
 androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
 androidx-compose-material3-adaptive = { group = "androidx.compose.material3.adaptive", name = "adaptive" }
+androidx-splash = { group = "androidx.core", name = "core-splashscreen", version = "1.2.0" }
 androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "lifecycleProcess" }
 androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version = "2.9.8" }
 androidx-work = { group = "androidx.work", name = "work-runtime-ktx", version = "2.11.2" }
@@ -71,6 +72,7 @@ androidx = [
     "androidx-compose-ui-test-junit4",
     "androidx-compose-material3",
     "androidx-compose-material3-adaptive",
+    "androidx-splash",
     "androidx-lifecycle-process",
     "androidx-navigation",
     "androidx-work",