diff --git a/app/src/main/java/com/infomaniak/mail/ui/LaunchActivity.kt b/app/src/main/java/com/infomaniak/mail/ui/LaunchActivity.kt
index 799cb281ed..a38f35dd25 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/LaunchActivity.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/LaunchActivity.kt
@@ -22,6 +22,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavDeepLinkBuilder
+import com.infomaniak.lib.core.extensions.keepSplashscreenVisibleWhileLoading
 import com.infomaniak.lib.core.extensions.setDefaultLocaleIfNeeded
 import com.infomaniak.lib.stores.StoreUtils.checkUpdateIsRequired
 import com.infomaniak.mail.BuildConfig
@@ -70,6 +71,8 @@ class LaunchActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        keepSplashscreenVisibleWhileLoading()
+
         setDefaultLocaleIfNeeded()
 
         handleNotificationDestinationIntent()
diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
new file mode 100644
index 0000000000..8de1c3a032
--- /dev/null
+++ b/app/src/main/res/values-night-v31/themes.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Infomaniak Mail - Android
+  ~ Copyright (C) 2024 Infomaniak Network SA
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+
+    <style name="AppThemeLauncher31" parent="AppTheme.LauncherBase">
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/splashscreen_animated_icon</item>
+        <item name="android:windowSplashScreenBackground">@color/backgroundColor</item>
+        <item name="android:windowSplashScreenBrandingImage">@drawable/splashscreen_branding_image</item>
+    </style>
+
+    <style name="AppThemeLauncher" parent="AppThemeLauncher31" />
+
+</resources>
diff --git a/app/src/main/res/values-night-v32/themes.xml b/app/src/main/res/values-night-v32/themes.xml
new file mode 100644
index 0000000000..5b11e6ddbd
--- /dev/null
+++ b/app/src/main/res/values-night-v32/themes.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Infomaniak Mail - Android
+  ~ Copyright (C) 2024 Infomaniak Network SA
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+
+    <style name="AppThemeLauncher32" parent="AppThemeLauncher31">
+        <!-- Not a magic value: "The maximum animation duration should be limited below 1000ms." -->
+        <item name="android:windowSplashScreenAnimationDuration">1000</item>
+    </style>
+
+    <style name="AppThemeLauncher" parent="AppThemeLauncher32" />
+
+</resources>
diff --git a/app/src/main/res/values-night-v33/themes.xml b/app/src/main/res/values-night-v33/themes.xml
new file mode 100644
index 0000000000..2f0c026276
--- /dev/null
+++ b/app/src/main/res/values-night-v33/themes.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Infomaniak Mail - Android
+  ~ Copyright (C) 2024 Infomaniak Network SA
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+
+    <style name="AppThemeLauncher33" parent="AppThemeLauncher32">
+        <item name="android:windowSplashScreenBehavior">icon_preferred</item>
+    </style>
+
+    <style name="AppThemeLauncher" parent="AppThemeLauncher33" />
+
+</resources>
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
index ee969929ba..8cd0f9d351 100644
--- a/app/src/main/res/values-v31/themes.xml
+++ b/app/src/main/res/values-v31/themes.xml
@@ -21,8 +21,6 @@
         <item name="android:windowSplashScreenAnimatedIcon">@drawable/splashscreen_animated_icon</item>
         <item name="android:windowSplashScreenBackground">@color/backgroundColor</item>
         <item name="android:windowSplashScreenBrandingImage">@drawable/splashscreen_branding_image</item>
-        <!-- Not a magic value: "The maximum animation duration should be limited below 1000ms." -->
-        <item name="android:windowSplashScreenAnimationDuration">1000</item>
     </style>
 
     <style name="AppThemeLauncher" parent="AppThemeLauncher31" />
diff --git a/app/src/main/res/values-v32/themes.xml b/app/src/main/res/values-v32/themes.xml
new file mode 100644
index 0000000000..5b11e6ddbd
--- /dev/null
+++ b/app/src/main/res/values-v32/themes.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Infomaniak Mail - Android
+  ~ Copyright (C) 2024 Infomaniak Network SA
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+
+    <style name="AppThemeLauncher32" parent="AppThemeLauncher31">
+        <!-- Not a magic value: "The maximum animation duration should be limited below 1000ms." -->
+        <item name="android:windowSplashScreenAnimationDuration">1000</item>
+    </style>
+
+    <style name="AppThemeLauncher" parent="AppThemeLauncher32" />
+
+</resources>
diff --git a/app/src/main/res/values-v33/themes.xml b/app/src/main/res/values-v33/themes.xml
new file mode 100644
index 0000000000..2f0c026276
--- /dev/null
+++ b/app/src/main/res/values-v33/themes.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Infomaniak Mail - Android
+  ~ Copyright (C) 2024 Infomaniak Network SA
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+
+    <style name="AppThemeLauncher33" parent="AppThemeLauncher32">
+        <item name="android:windowSplashScreenBehavior">icon_preferred</item>
+    </style>
+
+    <style name="AppThemeLauncher" parent="AppThemeLauncher33" />
+
+</resources>