diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
index 58e4a5df..76aa93ea 100644
--- a/androidApp/build.gradle.kts
+++ b/androidApp/build.gradle.kts
@@ -59,6 +59,8 @@ dependencies {
   implementation(libs.kotlinx.coroutines.play.services)
 
   // Support
+  implementation(libs.androidx.core)
+  implementation(libs.androidx.core.splashscreen)
   implementation(libs.androidx.activity.compose)
   implementation(libs.jetbrains.lifecycle.runtime)
 
diff --git a/androidApp/src/main/AndroidManifest.xml b/androidApp/src/main/AndroidManifest.xml
index 3a9162d5..c0b52aa8 100644
--- a/androidApp/src/main/AndroidManifest.xml
+++ b/androidApp/src/main/AndroidManifest.xml
@@ -38,6 +38,7 @@
             android:launchMode="singleTask"
             android:name=".MainActivity"
             android:screenOrientation="portrait"
+            android:theme="@style/Theme.AndroidMakers.Starting"
             tools:ignore="LockedOrientationActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/androidApp/src/main/java/fr/paug/androidmakers/MainActivity.kt b/androidApp/src/main/java/fr/paug/androidmakers/MainActivity.kt
index c1b003d2..cefdf356 100644
--- a/androidApp/src/main/java/fr/paug/androidmakers/MainActivity.kt
+++ b/androidApp/src/main/java/fr/paug/androidmakers/MainActivity.kt
@@ -8,6 +8,7 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.produceState
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.util.Consumer
 import androidx.credentials.ClearCredentialStateRequest
 import androidx.credentials.CredentialManager
@@ -39,6 +40,7 @@ class MainActivity : ComponentActivity() {
   }
 
   override fun onCreate(savedInstanceState: Bundle?) {
+    installSplashScreen()
     super.onCreate(savedInstanceState)
 
     enableEdgeToEdge()
diff --git a/androidApp/src/main/res/values-night/themes.xml b/androidApp/src/main/res/values-night/themes.xml
index bdc7ab63..52ca0c8d 100644
--- a/androidApp/src/main/res/values-night/themes.xml
+++ b/androidApp/src/main/res/values-night/themes.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <style name="Theme.AndroidMakers.Starting" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/backgroundDark</item>
+        <item name="windowSplashScreenAnimatedIcon">@mipmap/ic_launcher_foreground</item>
+        <item name="postSplashScreenTheme">@style/Theme.AndroidMakers</item>
+    </style>
+
     <style name="Theme.AndroidMakers" parent="android:Theme.Material.NoActionBar">
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
diff --git a/androidApp/src/main/res/values/themes.xml b/androidApp/src/main/res/values/themes.xml
index f19aa8ef..638ec4df 100644
--- a/androidApp/src/main/res/values/themes.xml
+++ b/androidApp/src/main/res/values/themes.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
+    <style name="Theme.AndroidMakers.Starting" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/backgroundLight</item>
+        <item name="windowSplashScreenAnimatedIcon">@mipmap/ic_launcher_foreground</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
+        <item name="postSplashScreenTheme">@style/Theme.AndroidMakers</item>
+    </style>
+
     <style name="Theme.AndroidMakers" parent="android:Theme.Material.Light.NoActionBar">
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 48f63681..cf1b38da 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,6 +6,7 @@ androidDesugarJdkLibs = "2.1.5"
 androidGradlePlugin = "8.9.0"
 androidx-activity = "1.10.1"
 androidx-core = "1.15.0"
+androidx-core-splashscreen = "1.2.0-beta01"
 androidx-credentials = "1.3.0"
 androidx-datastore = "1.1.3"
 androidx-lifecycle = "2.8.7"    # Used by the Wear OS app only
@@ -40,6 +41,7 @@ playServices-wearable = "19.0.0"
 [libraries]
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidx-activity" }
 androidx-core = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core" }
+androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "androidx-core-splashscreen" }
 androidx-credentials = { group = "androidx.credentials", name = "credentials", version.ref = "androidx-credentials" }
 androidx-credentials-playServicesAuth = { group = "androidx.credentials", name = "credentials-play-services-auth", version.ref = "androidx-credentials" }
 androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "androidx-datastore" }
@@ -89,7 +91,6 @@ kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-pl
 desugar-jdk-libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" }
 
 # Wear dependencies
-androidx-splashscreen = "androidx.core:core-splashscreen:1.0.1"
 play-services-wearable = { group = "com.google.android.gms", name = "play-services-wearable", version.ref = "playServices-wearable" }
 wear-compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "androidx-wear-compose" }
 wear-compose-foundation = { module = "androidx.wear.compose:compose-foundation", version.ref = "androidx-wear-compose" }
diff --git a/wearApp/build.gradle.kts b/wearApp/build.gradle.kts
index f59aff18..e2a43f0f 100644
--- a/wearApp/build.gradle.kts
+++ b/wearApp/build.gradle.kts
@@ -60,9 +60,9 @@ dependencies {
   implementation(libs.play.services.wearable)
   implementation(libs.play.services.auth)
   implementation(libs.androidx.core)
+  implementation(libs.androidx.core.splashscreen)
   implementation(libs.androidx.activity.compose)
   implementation(libs.androidx.lifecycle.viewmodel.compose)
-  implementation(libs.androidx.splashscreen)
   implementation(libs.wear.compose.material)
   implementation(libs.wear.compose.foundation)
   implementation(libs.compose.ui.tooling.preview)