diff --git a/src/skins/vector/css/matrix-react-sdk/views/elements/_RichText.scss b/src/skins/vector/css/matrix-react-sdk/views/elements/_RichText.scss
index 2dcd8136..55819dbb 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/elements/_RichText.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/elements/_RichText.scss
@@ -5,15 +5,19 @@
 .mx_UserPill {
     color: white;
     background-color: $accent-color;
-    padding: 2px 8px;
+    padding: 1px 5px 0px 2px;
     border-radius: 16px;
 }
 
+.mx_UserPill img, .mx_RoomPill img {
+    vertical-align: -2px;
+    margin-right: 1px
+}
+
 .mx_RoomPill {
-    background-color: white;
-    color: $accent-color;
-    border: 1px solid $accent-color;
-    padding: 2px 8px;
+    background-color: #aaa;
+    color: white;
+    padding: 1px 5px 0px 2px;
     border-radius: 16px;
 }
 
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss
index 6c2216dd..43a58030 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss
@@ -100,6 +100,11 @@ limitations under the License.
     word-break: break-word;
 }
 
+.mx_MessageComposer_input .DraftEditor-root .DraftEditor-editorContainer {
+    /* Ensure mx_UserPill and mx_RoomPill (see _RichText) are not obscured from the top */
+    padding-top: 2px;
+}
+
 .mx_MessageComposer_input blockquote {
     color: $blockquote-fg-color;
     margin: 0 0 16px;