diff --git a/src/components/views/rooms/EntityTile.js b/src/components/views/rooms/EntityTile.js
index 43b12006a6..ec586431be 100644
--- a/src/components/views/rooms/EntityTile.js
+++ b/src/components/views/rooms/EntityTile.js
@@ -35,6 +35,7 @@ module.exports = React.createClass({
         name: React.PropTypes.string,
         title: React.PropTypes.string,
         avatarJsx: React.PropTypes.any, // <BaseAvatar />
+        className: React.PropTypes.string,
         presenceState: React.PropTypes.string,
         presenceActiveAgo: React.PropTypes.number,
         showInviteButton: React.PropTypes.bool,
@@ -76,7 +77,7 @@ module.exports = React.createClass({
     render: function() {
         var presenceClass = PRESENCE_CLASS[this.props.presenceState] || "mx_EntityTile_offline";
         var mainClassName = "mx_EntityTile ";
-        mainClassName += presenceClass;
+        mainClassName += presenceClass + (this.props.className ? (" " + this.props.className) : "");
         var nameEl;
 
         if (this.state.hover && !this.props.suppressOnHover) {
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index f02d5d6839..ebbebca2f0 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -262,10 +262,10 @@ module.exports = React.createClass({
         // For now we'll pretend this is any entity. It should probably be a separate tile.
         var EntityTile = sdk.getComponent("rooms.EntityTile");
         var BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
-        var text = "and " + overflowCount + " more";
+        var text = "and " + overflowCount + " other" + (overflowCount > 1 : "s" : "") +  "...";
         return (
-            <EntityTile avatarJsx={
-                <BaseAvatar name="+" width={36} height={36} />
+            <EntityTile className="mx_EntityTile_ellipsis" avatarJsx={
+                <BaseAvatar url="img/ellipsis.svg" name="..." width={36} height={36} />
             } name={text} presenceState="online" suppressOnHover={true}
             onClick={this._showFullMemberList} />
         );