diff --git a/build.gradle b/build.gradle
index 75f36d9358..9bd27c555f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -378,7 +378,7 @@ dependencies {
     //androidTestImplementation "com.android.support:support-annotations:${supportLibraryVersion}"
     androidTestImplementation 'tools.fastlane:screengrab:2.0.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    androidTestCompile('com.android.support.test.espresso:espresso-intents:3.0.2')
+    androidTestImplementation('com.android.support.test.espresso:espresso-intents:3.0.2')
 
 //    jacocoAnt "org.jacoco:org.jacoco.ant:${jacocoVersion}"
 //    jacocoAgent "org.jacoco:org.jacoco.agent:${jacocoVersion}"
diff --git a/src/main/res/values-v21/styles.xml b/src/main/res/values-v21/styles.xml
index e22074d8fa..981f5da065 100644
--- a/src/main/res/values-v21/styles.xml
+++ b/src/main/res/values-v21/styles.xml
@@ -73,4 +73,12 @@
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:colorBackground">@color/bg_default</item>
     </style>
+
+    <!-- Launch screen -->
+    <style name="Theme.ownCloud.Launcher">
+        <item name="android:statusBarColor">@color/primary</item>
+        <item name="android:navigationBarColor">@color/primary</item>
+        <item name="android:windowBackground">@drawable/launch_screen</item>
+        <item name="android:textColorHint">@color/secondary_text_color</item>
+    </style>
 </resources>