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" />
-
+ app:layout_constraintStart_toStartOf="parent"
+ tools:itemCount="1"
+ tools:listitem="@layout/item_attachment_miniature_preview" />
@@ -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" />
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 @@
+ android:layout_height="match_parent">
+ app:layout_constraintTop_toBottomOf="@+id/incomingShareToolbar"
+ tools:listitem="@layout/item_room" />
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 @@
@@ -7,6 +8,7 @@
+ android:layout_height="match_parent"
+ tools:src="@tools:sample/backgrounds/scenic" />
\ 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 @@
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 @@
-
-
-