diff --git a/res/css/views/avatars/_DecoratedRoomAvatar.scss b/res/css/views/avatars/_DecoratedRoomAvatar.scss
index 984fa0ce9a..b500d44a43 100644
--- a/res/css/views/avatars/_DecoratedRoomAvatar.scss
+++ b/res/css/views/avatars/_DecoratedRoomAvatar.scss
@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_DecoratedRoomAvatar {
+// XXX: We shouldn't be using TemporaryTile anywhere - delete it.
+.mx_DecoratedRoomAvatar, .mx_TemporaryTile {
     position: relative;
 
     .mx_RoomTileIcon {
diff --git a/res/css/views/rooms/_RoomTile2.scss b/res/css/views/rooms/_RoomTile2.scss
index 38c30cf320..d366e1b226 100644
--- a/res/css/views/rooms/_RoomTile2.scss
+++ b/res/css/views/rooms/_RoomTile2.scss
@@ -148,7 +148,7 @@ limitations under the License.
         align-items: center;
         position: relative;
 
-        .mx_DecoratedRoomAvatar {
+        .mx_DecoratedRoomAvatar, .mx_RoomTile2_avatarContainer {
             margin-right: 0;
         }
     }
diff --git a/src/components/views/rooms/TemporaryTile.tsx b/src/components/views/rooms/TemporaryTile.tsx
index 3087e738f1..b6c165ecda 100644
--- a/src/components/views/rooms/TemporaryTile.tsx
+++ b/src/components/views/rooms/TemporaryTile.tsx
@@ -56,6 +56,7 @@ export default class TemporaryTile extends React.Component<IProps, IState> {
         // XXX: We copy classes because it's easier
         const classes = classNames({
             'mx_RoomTile2': true,
+            'mx_TemporaryTile': true,
             'mx_RoomTile2_selected': this.props.isSelected,
             'mx_RoomTile2_minimized': this.props.isMinimized,
         });
@@ -85,7 +86,6 @@ export default class TemporaryTile extends React.Component<IProps, IState> {
         );
         if (this.props.isMinimized) nameContainer = null;
 
-        const avatarSize = 32;
         return (
             <React.Fragment>
                 <RovingTabIndexWrapper>