diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index 5d4abd6dfe..08340c3e61 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -30,9 +30,10 @@
 
         <ImageView
             android:id="@+id/ivExpander"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|center_horizontal"
+            android:layout_marginStart="6dp"
             android:src="@drawable/baseline_expand_less_24"
             android:visibility="visible"
             app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index 4cb78c8756..bf95b4810d 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -29,9 +29,10 @@
 
         <ImageView
             android:id="@+id/ivExpander"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|center_horizontal"
+            android:layout_marginStart="6dp"
             android:src="@drawable/baseline_expand_less_24"
             android:visibility="visible"
             app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"