diff --git a/vector/src/main/res/drawable-hdpi/empty_state_dm.png b/vector/src/main/res/drawable-hdpi/empty_state_dm.png
deleted file mode 100644
index 74e80f2a9c..0000000000
Binary files a/vector/src/main/res/drawable-hdpi/empty_state_dm.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-hdpi/empty_state_room.png b/vector/src/main/res/drawable-hdpi/empty_state_room.png
deleted file mode 100644
index a75bee0ff8..0000000000
Binary files a/vector/src/main/res/drawable-hdpi/empty_state_room.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-mdpi/empty_state_dm.png b/vector/src/main/res/drawable-mdpi/empty_state_dm.png
deleted file mode 100644
index 40b77b8c8e..0000000000
Binary files a/vector/src/main/res/drawable-mdpi/empty_state_dm.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-mdpi/empty_state_room.png b/vector/src/main/res/drawable-mdpi/empty_state_room.png
deleted file mode 100644
index ce8db02234..0000000000
Binary files a/vector/src/main/res/drawable-mdpi/empty_state_room.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-nodpi/empty_state_dm.png b/vector/src/main/res/drawable-nodpi/empty_state_dm.png
new file mode 100644
index 0000000000..12eedc803f
Binary files /dev/null and b/vector/src/main/res/drawable-nodpi/empty_state_dm.png differ
diff --git a/vector/src/main/res/drawable-xxhdpi/empty_state_room.png b/vector/src/main/res/drawable-nodpi/empty_state_room.png
similarity index 100%
rename from vector/src/main/res/drawable-xxhdpi/empty_state_room.png
rename to vector/src/main/res/drawable-nodpi/empty_state_room.png
diff --git a/vector/src/main/res/drawable-xxhdpi/empty_state_dm.png b/vector/src/main/res/drawable-xxhdpi/empty_state_dm.png
deleted file mode 100644
index 2d3d727446..0000000000
Binary files a/vector/src/main/res/drawable-xxhdpi/empty_state_dm.png and /dev/null differ
diff --git a/vector/src/main/res/layout/view_state.xml b/vector/src/main/res/layout/view_state.xml
index e8c7b9c8ac..7d3f88a2c0 100644
--- a/vector/src/main/res/layout/view_state.xml
+++ b/vector/src/main/res/layout/view_state.xml
@@ -58,12 +58,14 @@
         <ImageView
             android:id="@+id/emptyImageView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             android:layout_gravity="center_horizontal"
             android:layout_marginStart="20dp"
             android:layout_marginEnd="20dp"
+            android:maxHeight="350dp"
             app:layout_constraintBottom_toTopOf="@id/emptyTitleView"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHeight_percent="0.5"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_chainStyle="packed"