diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
index d17cd96742..46b522ff25 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
@@ -127,6 +127,7 @@
         app:layout_constraintEnd_toStartOf="@+id/composerEditText"
         app:layout_constraintStart_toEndOf="@+id/composerEmojiButton"
         app:layout_constraintTop_toTopOf="@id/sendButton"
+        app:layout_goneMarginStart="12dp"
         tools:src="@drawable/ic_shield_black"
         tools:visibility="visible" />
 
@@ -142,6 +143,7 @@
         app:layout_constraintEnd_toStartOf="@+id/attachmentButton"
         app:layout_constraintStart_toEndOf="@+id/composerShieldImageView"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_goneMarginStart="8dp"
         tools:text="@tools:sample/lorem/random" />
 
     <ImageButton
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
index b902d7696b..b8b4cb346f 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
@@ -130,6 +130,7 @@
         app:layout_constraintEnd_toStartOf="@+id/composerEditText"
         app:layout_constraintStart_toEndOf="@+id/composerEmojiButton"
         app:layout_constraintTop_toTopOf="@+id/sendButton"
+        app:layout_goneMarginStart="12dp"
         tools:src="@drawable/ic_shield_black" />
 
     <im.vector.app.features.home.room.detail.composer.ComposerEditText
@@ -143,6 +144,7 @@
         app:layout_constraintEnd_toStartOf="@+id/sendButton"
         app:layout_constraintStart_toEndOf="@+id/composerShieldImageView"
         app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier"
+        app:layout_goneMarginStart="8dp"
         tools:text="@tools:sample/lorem/random" />
 
     <ImageButton