diff --git a/vector/src/main/res/layout/fragment_attachments_preview.xml b/vector/src/main/res/layout/fragment_attachments_preview.xml
index bcb5d682c4..ba1039eda7 100644
--- a/vector/src/main/res/layout/fragment_attachments_preview.xml
+++ b/vector/src/main/res/layout/fragment_attachments_preview.xml
@@ -25,11 +25,10 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/attachmentPreviewerBottomContainer"
         android:layout_width="match_parent"
-        android:layout_height="200dp"
+        android:layout_height="wrap_content"
         android:background="#80000000"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -42,7 +41,9 @@
             android:padding="8dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            tools:itemCount="1"
+            tools:listitem="@layout/item_attachment_miniature_preview" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -52,8 +53,8 @@
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
         android:src="@drawable/ic_send"
-        app:layout_constraintTop_toTopOf="@id/attachmentPreviewerBottomContainer"
         app:layout_constraintBottom_toTopOf="@id/attachmentPreviewerBottomContainer"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/attachmentPreviewerBottomContainer" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_incoming_share.xml b/vector/src/main/res/layout/fragment_incoming_share.xml
index 51162835fc..e88e52a773 100644
--- a/vector/src/main/res/layout/fragment_incoming_share.xml
+++ b/vector/src/main/res/layout/fragment_incoming_share.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -36,7 +36,8 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/incomingShareToolbar" />
+            app:layout_constraintTop_toBottomOf="@+id/incomingShareToolbar"
+            tools:listitem="@layout/item_room" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/sendShareButton"
@@ -44,12 +45,12 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="16dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
             android:accessibilityTraversalBefore="@id/incomingShareRoomList"
             android:contentDescription="@string/a11y_create_room"
             android:src="@drawable/ic_send"
             android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             tools:visibility="visible" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_attachment_big_preview.xml b/vector/src/main/res/layout/item_attachment_big_preview.xml
index 3705965520..e3fb89416e 100644
--- a/vector/src/main/res/layout/item_attachment_big_preview.xml
+++ b/vector/src/main/res/layout/item_attachment_big_preview.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/black">
@@ -7,6 +8,7 @@
     <ImageView
         android:id="@+id/attachmentBigImageView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        tools:src="@tools:sample/backgrounds/scenic" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/vector_attachments_preview.xml b/vector/src/main/res/menu/vector_attachments_preview.xml
index 4adf9dcff9..c3c8529b18 100755
--- a/vector/src/main/res/menu/vector_attachments_preview.xml
+++ b/vector/src/main/res/menu/vector_attachments_preview.xml
@@ -7,13 +7,13 @@
     <item
         android:id="@+id/attachmentsPreviewRemoveAction"
         android:icon="@drawable/ic_delete"
-        android:title="Delete"
+        android:title="@string/delete"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/attachmentsPreviewEditAction"
         android:icon="@drawable/ic_edit"
-        android:title="Edit"
+        android:title="@string/edit"
         app:showAsAction="always" />
 
 </menu>
diff --git a/vector/src/main/res/values-v21/theme_common.xml b/vector/src/main/res/values-v21/theme_common.xml
index 155c73acdc..dfd3007908 100644
--- a/vector/src/main/res/values-v21/theme_common.xml
+++ b/vector/src/main/res/values-v21/theme_common.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!-- Launcher Theme, only used for VectorLauncherActivity (will be use even before the Activity is started) -->
-    <style name="AppTheme.Launcher" parent="Theme.MaterialComponents.Light.NoActionBar">
-        <item name="android:windowBackground">@drawable/splash</item>
-
-        <item name="colorPrimaryDark">@color/primary_color_dark</item>
-    </style>
-
     <style name="AppTheme.AttachmentsPreview" parent="AppTheme.Base.Black">
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>