diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 0bafc90fe5..9effc8fdde 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -218,9 +218,6 @@ module.exports = React.createClass({
                 <div className="mx_RoomHeader_name" onClick={this.props.onSettingsClick}>
                     <div className={ "mx_RoomHeader_nametext " + (settingsHint ? "mx_RoomHeader_settingsHint" : "") } title={ roomName } dangerouslySetInnerHTML={roomNameHTML}></div>
                     { searchStatus }
-                    <div className="mx_RoomHeader_settingsButton" title="Settings">
-                        <TintableSvg src="img/settings.svg" width="12" height="12"/>
-                    </div>
                 </div>
         }
 
@@ -266,6 +263,14 @@ module.exports = React.createClass({
             );
         }
 
+        var settings_button;
+        if (this.props.onSettingsClick) {
+            settings_button =
+                <div className="mx_RoomHeader_button mx_RoomHeader_settingsButton" onClick={this.props.onSettingsClick} title="Settings">
+                    <TintableSvg src="img/icons-settings-room.svg" width="16" height="16"/>
+                </div>;
+        }
+
         var leave_button;
         if (this.props.onLeaveClick) {
             leave_button =
@@ -291,6 +296,7 @@ module.exports = React.createClass({
         if (!this.props.editing) {
             right_row =
                 <div className="mx_RoomHeader_rightRow">
+                    { settings_button }
                     { forget_button }
                     { leave_button }
                     <div className="mx_RoomHeader_button" onClick={this.props.onSearchClick} title="Search">