diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 9effc8fdde..4298fdb019 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -274,7 +274,7 @@ module.exports = React.createClass({
         var leave_button;
         if (this.props.onLeaveClick) {
             leave_button =
-                <div className="mx_RoomHeader_button mx_RoomHeader_leaveButton" onClick={this.props.onLeaveClick} title="Leave room">
+                <div className="mx_RoomHeader_button" onClick={this.props.onLeaveClick} title="Leave room">
                     <TintableSvg src="img/leave.svg" width="26" height="20"/>
                 </div>;
         }
@@ -282,7 +282,7 @@ module.exports = React.createClass({
         var forget_button;
         if (this.props.onForgetClick) {
             forget_button =
-                <div className="mx_RoomHeader_button mx_RoomHeader_leaveButton" onClick={this.props.onForgetClick} title="Forget room">
+                <div className="mx_RoomHeader_button" onClick={this.props.onForgetClick} title="Forget room">
                     <TintableSvg src="img/leave.svg" width="26" height="20"/>
                 </div>;
         }
@@ -300,7 +300,7 @@ module.exports = React.createClass({
                     { forget_button }
                     { leave_button }
                     <div className="mx_RoomHeader_button" onClick={this.props.onSearchClick} title="Search">
-                        <TintableSvg src="img/search.svg" width="21" height="19"/>
+                        <TintableSvg src="img/icons-search.svg" width="35" height="35"/>
                     </div>
                     { rightPanel_buttons }
                 </div>;