diff --git a/res/css/views/settings/tabs/_GeneralRoomSettingsTab.scss b/res/css/views/settings/tabs/_GeneralRoomSettingsTab.scss
index d1274973d5..d3ae1d94f7 100644
--- a/res/css/views/settings/tabs/_GeneralRoomSettingsTab.scss
+++ b/res/css/views/settings/tabs/_GeneralRoomSettingsTab.scss
@@ -17,3 +17,7 @@ limitations under the License.
 .mx_GeneralRoomSettingsTab_profileSection {
   margin-top: 10px;
 }
+
+.mx_GeneralRoomSettingsTab .mx_AliasSettings .mx_Field select {
+  width: 100%;
+}
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 373e4dc9fb..d5f5e03c1b 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -279,7 +279,7 @@ module.exports = React.createClass({
         }
 
         return (
-            <div>
+            <div className='mx_AliasSettings'>
                 {canonical_alias_section}
                 <EditableItemList
                     className={"mx_RoomSettings_localAliases"}
diff --git a/src/components/views/settings/RoomProfileSettings.js b/src/components/views/settings/RoomProfileSettings.js
index 4d925967b1..1183b82c96 100644
--- a/src/components/views/settings/RoomProfileSettings.js
+++ b/src/components/views/settings/RoomProfileSettings.js
@@ -34,7 +34,8 @@ export default class RoomProfileSettings extends React.Component {
         const client = MatrixClientPeg.get();
         const room = client.getRoom(props.roomId);
         if (!room) throw new Error("Expected a room for ID: ", props.roomId);
-        let avatarUrl = room.avatarUrl;
+        const avatarEvent = room.currentState.getStateEvents("m.room.avatar", "");
+        let avatarUrl = avatarEvent && avatarEvent.getContent() ? avatarEvent.getContent()["url"] : null;
         if (avatarUrl) avatarUrl = client.mxcUrlToHttp(avatarUrl, 96, 96, 'crop', false);
         const topicEvent = room.currentState.getStateEvents("m.room.topic", "");
         const topic = topicEvent && topicEvent.getContent() ? topicEvent.getContent()['topic'] : null;