diff --git a/res/css/views/elements/_Pill.scss b/res/css/views/elements/_Pill.scss
index e9ccef666a..fa854b7662 100644
--- a/res/css/views/elements/_Pill.scss
+++ b/res/css/views/elements/_Pill.scss
@@ -48,8 +48,8 @@ limitations under the License.
 
     &::before,
     .mx_BaseAvatar {
-        margin-left: -0.3em; // Otherwise the gap is too large
-        margin-right: 0.2em;
+        margin-inline-start: -0.3em; // Otherwise the gap is too large
+        margin-inline-end: 0.2em;
     }
 
     a& {
diff --git a/res/css/views/rooms/_BasicMessageComposer.scss b/res/css/views/rooms/_BasicMessageComposer.scss
index c89fa6028b..ea9bcd1adf 100644
--- a/res/css/views/rooms/_BasicMessageComposer.scss
+++ b/res/css/views/rooms/_BasicMessageComposer.scss
@@ -51,7 +51,9 @@ limitations under the License.
         }
 
         &.mx_BasicMessageComposer_input_shouldShowPillAvatar {
-            span.mx_UserPill, span.mx_RoomPill, span.mx_SpacePill {
+            span.mx_UserPill,
+            span.mx_RoomPill,
+            span.mx_SpacePill {
                 user-select: all;
                 position: relative;
                 cursor: unset; // We don't want indicate clickability
@@ -66,7 +68,7 @@ limitations under the License.
                     content: var(--avatar-letter);
                     width: $font-16px;
                     height: $font-16px;
-                    margin-right: 0.24rem;
+                    margin-inline-end: 0.24rem;
                     background: var(--avatar-background), $background;
                     color: $avatar-initial-color;
                     background-repeat: no-repeat;