diff --git a/res/css/views/avatars/_MemberStatusMessageAvatar.scss b/res/css/views/avatars/_MemberStatusMessageAvatar.scss
index c857b9807b..29cae9df34 100644
--- a/res/css/views/avatars/_MemberStatusMessageAvatar.scss
+++ b/res/css/views/avatars/_MemberStatusMessageAvatar.scss
@@ -17,4 +17,5 @@ limitations under the License.
 .mx_MemberStatusMessageAvatar_hasStatus {
     border: 2px solid $accent-color;
     border-radius: 40px;
+    padding-right: 0 !important; /* Override AccessibleButton styling */
 }
diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index 99a904cebb..70d505e4ea 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -52,7 +52,7 @@ limitations under the License.
 .mx_RoomTile_nameContainer {
     display: flex;
     align-items: center;
-    width: 180px;
+    flex: 1;
     vertical-align: middle;
 }
 
@@ -62,11 +62,6 @@ limitations under the License.
     flex: 1;
 }
 
-.mx_RoomTile_avatar {
-    flex: 0;
-    padding: 4px;
-}
-
 .mx_RoomTile_subtext {
     display: inline-block;
     font-size: 11px;
@@ -84,11 +79,8 @@ limitations under the License.
 }
 
 .mx_RoomTile_avatar {
-    display: inline-block;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    padding-left: 16px;
-    padding-right: 6px;
+    flex: 0;
+    padding: 4px;
     width: 24px;
     vertical-align: middle;
 }