diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 9e73f7a8..9d3e6fe2 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
 
         <activity
             android:name=".features.MainActivity"
-            android:theme="@style/Theme.Riot.Splash">
+            android:theme="@style/AppTheme.Launcher">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/LoadingRoomDetailFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/LoadingRoomDetailFragment.kt
index 6eb4c35a..11e9593c 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/LoadingRoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/LoadingRoomDetailFragment.kt
@@ -16,9 +16,9 @@
 
 package im.vector.riotredesign.features.home.room.detail
 
+import android.graphics.drawable.AnimationDrawable
 import android.os.Bundle
 import android.view.View
-import com.bumptech.glide.Glide
 import im.vector.riotredesign.R
 import im.vector.riotredesign.core.platform.RiotFragment
 import kotlinx.android.synthetic.main.fragment_loading_room_detail.*
@@ -36,9 +36,11 @@ class LoadingRoomDetailFragment : RiotFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        Glide.with(this)
-                .load(R.drawable.riot_splash)
-                .into(animatedLogoImageView)
+
+        val background = animatedLogoImageView.background
+        if (background is AnimationDrawable) {
+            background.start()
+        }
     }
 
 
diff --git a/vector/src/main/res/drawable/riot_splash.gif b/vector/src/main/res/drawable/riot_splash.gif
deleted file mode 100644
index 6da2541f..00000000
Binary files a/vector/src/main/res/drawable/riot_splash.gif and /dev/null differ
diff --git a/vector/src/main/res/layout/fragment_loading_room_detail.xml b/vector/src/main/res/layout/fragment_loading_room_detail.xml
index c7d7d468..96bafda3 100644
--- a/vector/src/main/res/layout/fragment_loading_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_loading_room_detail.xml
@@ -7,21 +7,21 @@
     <!-- Note: Gif will be loaded by the code -->
     <ImageView
         android:id="@+id/animatedLogoImageView"
-        android:layout_width="240dp"
-        android:layout_height="240dp"
-        app:layout_constraintBottom_toTopOf="@+id/progressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/riot_animated_logo"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ProgressBar
         android:id="@+id/progressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
+        android:layout_marginTop="@dimen/layout_vertical_margin_big"
         android:indeterminate="true"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/animatedLogoImageView" />
diff --git a/vector/src/main/res/values-v21/themes_base.xml b/vector/src/main/res/values-v21/themes_base.xml
deleted file mode 100644
index 55c57742..00000000
--- a/vector/src/main/res/values-v21/themes_base.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Base.V21.Theme.Riot" parent="Base.V1.Theme.Riot" />
-
-    <style name="Base.Theme.Riot" parent="Base.V21.Theme.Riot" />
-
-</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/ic_launcher_background.xml b/vector/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 00000000..e1405efa
--- /dev/null
+++ b/vector/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFF</color>
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/themes.xml b/vector/src/main/res/values/themes.xml
deleted file mode 100644
index 751344c7..00000000
--- a/vector/src/main/res/values/themes.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Theme.Riot" parent="Base.Theme.Riot">
-
-    </style>
-
-    <style name="Theme.Riot.Splash">
-        <item name="android:windowBackground">@drawable/bg_splash</item>
-    </style>
-
-
-</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/themes_base.xml b/vector/src/main/res/values/themes_base.xml
deleted file mode 100644
index 257f8fc5..00000000
--- a/vector/src/main/res/values/themes_base.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Base.V1.Theme.Riot" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
-        <item name="colorPrimary">@color/dark</item>
-        <item name="colorPrimaryDark">@color/dark</item>
-        <item name="colorAccent">@color/pale_teal</item>
-        <item name="buttonStyle">@style/Widget.Button</item>
-    </style>
-
-    <style name="Base.Theme.Riot" parent="Base.V1.Theme.Riot" />
-
-
-</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/themes_overlay.xml b/vector/src/main/res/values/themes_overlay.xml
deleted file mode 100644
index a6b3daec..00000000
--- a/vector/src/main/res/values/themes_overlay.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/themes_overlay_base.xml b/vector/src/main/res/values/themes_overlay_base.xml
deleted file mode 100644
index a6b3daec..00000000
--- a/vector/src/main/res/values/themes_overlay_base.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file