diff --git a/res/css/structures/_RoomView.pcss b/res/css/structures/_RoomView.pcss
index b7ab171615..5012013cf3 100644
--- a/res/css/structures/_RoomView.pcss
+++ b/res/css/structures/_RoomView.pcss
@@ -34,8 +34,6 @@ Please see LICENSE files in the repository root for full details.
     .mx_MessageComposer {
         width: 100%;
         flex: 0 0 auto;
-        margin-right: 2px;
-        padding-bottom: 1em;
     }
 }
 
diff --git a/res/css/views/rooms/_MessageComposer.pcss b/res/css/views/rooms/_MessageComposer.pcss
index b5041fda6f..63ab25e84d 100644
--- a/res/css/views/rooms/_MessageComposer.pcss
+++ b/res/css/views/rooms/_MessageComposer.pcss
@@ -8,11 +8,6 @@ Please see LICENSE files in the repository root for full details.
 
 .mx_MessageComposer_wrapper {
     vertical-align: middle;
-    margin: auto;
-    margin-left: 8px;
-    margin-right: 8px;
-    border: 1px solid $primary-hairline-color;
-    border-radius: 8px;
     position: relative;
     padding-left: 50px;
     padding-right: 16px;
@@ -76,12 +71,13 @@ Please see LICENSE files in the repository root for full details.
 }
 .mx_MessageComposer_e2eIconWrapper {
     height: 16px; /* Match the height of the E2E icon for alignment */
+    padding-left: 24px; /* Space for the E2E icon */
 }
 .mx_MessageComposer_e2eIcon.mx_E2EIcon {
     position: absolute;
     left: 20px;
     margin-right: 0; /* Counteract the E2EIcon class */
-    margin-left: 3px; /* Counteract the E2EIcon class */
+    margin-left: 16px; /* Counteract the E2EIcon class */
     width: 16px;
     height: 16px;
 }