diff --git a/vector-app/src/main/AndroidManifest.xml b/vector-app/src/main/AndroidManifest.xml
index c6d9e9f934..774fc43d48 100644
--- a/vector-app/src/main/AndroidManifest.xml
+++ b/vector-app/src/main/AndroidManifest.xml
@@ -3,7 +3,19 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="im.vector.application">
 
-    <application>
+    <application
+        android:allowBackup="false"
+        android:hasFragileUserData="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:resizeableActivity="true"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:taskAffinity="${applicationId}.${appTaskAffinitySuffix}"
+        android:theme="@style/Theme.Vector.Light"
+        tools:ignore="UnusedAttribute"
+        tools:replace="android:allowBackup">
 
         <!-- Providers -->
 
diff --git a/vector/src/main/res/drawable/ic_launcher_background.xml b/vector-app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from vector/src/main/res/drawable/ic_launcher_background.xml
rename to vector-app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/vector/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from vector/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/vector/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from vector/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/vector/src/main/res/mipmap-hdpi/ic_launcher.png b/vector-app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from vector/src/main/res/mipmap-hdpi/ic_launcher.png
rename to vector-app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/vector/src/main/res/mipmap-hdpi/ic_launcher_round.png b/vector-app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from vector/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to vector-app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/vector/src/main/res/mipmap-mdpi/ic_launcher.png b/vector-app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from vector/src/main/res/mipmap-mdpi/ic_launcher.png
rename to vector-app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/vector/src/main/res/mipmap-mdpi/ic_launcher_round.png b/vector-app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from vector/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to vector-app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/vector/src/main/res/mipmap-xhdpi/ic_launcher.png b/vector-app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from vector/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to vector-app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/vector/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/vector-app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from vector/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to vector-app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/vector/src/main/res/mipmap-xxhdpi/ic_launcher.png b/vector-app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from vector/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to vector-app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/vector/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from vector/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/vector/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from vector/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from vector/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index d24731887f..e87bbad77a 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -75,19 +75,7 @@
         </intent>
     </queries>
 
-    <application
-        android:allowBackup="false"
-        android:hasFragileUserData="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:networkSecurityConfig="@xml/network_security_config"
-        android:resizeableActivity="true"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:taskAffinity="${applicationId}.${appTaskAffinitySuffix}"
-        android:theme="@style/Theme.Vector.Light"
-        tools:ignore="UnusedAttribute"
-        tools:replace="android:allowBackup">
+    <application android:supportsRtl="true">
 
         <!-- No limit for screen ratio: avoid black strips -->
         <meta-data