diff --git a/skins/base/css/hide.css b/skins/base/css/hide.css
new file mode 100644
index 00000000..381f9a18
--- /dev/null
+++ b/skins/base/css/hide.css
@@ -0,0 +1,11 @@
+.mx_RoomDropTarget,
+.mx_RoomList_favourites_label,
+.mx_RoomList_archive_label,
+.mx_LeftPanel_hideButton,
+.mx_RoomHeader_search,
+.mx_RoomSettings_encrypt,
+.mx_CreateRoom_encrypt,
+.mx_RightPanel_filebutton
+{
+    display: none !important;
+}
diff --git a/skins/base/views/molecules/RoomHeader.js b/skins/base/views/molecules/RoomHeader.js
index a2fbdd62..5e111243 100644
--- a/skins/base/views/molecules/RoomHeader.js
+++ b/skins/base/views/molecules/RoomHeader.js
@@ -104,13 +104,13 @@ module.exports = React.createClass({
                     {callButtons}
                     <div className="mx_RoomHeader_rightRow">
                         { settings_button }
-                        <div className="mx_RoomHeader_button">
+                        <div className="mx_RoomHeader_button mx_RoomHeader_search">
                             <img src="img/search.png" width="32" height="32"/>
                         </div>
-                        <div className="mx_RoomHeader_button" onClick={this.onVideoClick}>
+                        <div className="mx_RoomHeader_button mx_RoomHeader_video" onClick={this.onVideoClick}>
                             <img src="img/video.png" width="32" height="32"/>
                         </div>
-                        <div className="mx_RoomHeader_button" onClick={this.onVoiceClick}>
+                        <div className="mx_RoomHeader_button mx_RoomHeader_voice" onClick={this.onVoiceClick}>
                             <img src="img/voip.png" width="32" height="32"/>
                         </div>
                     </div>
diff --git a/skins/base/views/molecules/RoomSettings.js b/skins/base/views/molecules/RoomSettings.js
index 6e610019..27eb48de 100644
--- a/skins/base/views/molecules/RoomSettings.js
+++ b/skins/base/views/molecules/RoomSettings.js
@@ -131,7 +131,7 @@ module.exports = React.createClass({
                 <textarea className="mx_RoomSettings_description" placeholder="Topic" defaultValue={topic} ref="topic"/> <br/>
                 <label><input type="checkbox" ref="is_private" defaultChecked={join_rule != "public"}/> Make this room private</label> <br/>
                 <label><input type="checkbox" ref="share_history" defaultChecked={history_visibility == "shared"}/> Share message history with new users</label> <br/>
-                <label><input type="checkbox" /> Encrypt room</label> <br/>
+                <label className="mx_RoomSettings_encrypt"><input type="checkbox" /> Encrypt room</label> <br/>
 
                 <h3>Power levels</h3>
                 <div className="mx_RoomSettings_power_levels mx_RoomSettings_settings">
diff --git a/skins/base/views/organisms/CreateRoom.js b/skins/base/views/organisms/CreateRoom.js
index f44e745c..b362db78 100644
--- a/skins/base/views/organisms/CreateRoom.js
+++ b/skins/base/views/organisms/CreateRoom.js
@@ -155,7 +155,7 @@ module.exports = React.createClass({
                         <div>
                             <label><input type="checkbox" ref="share_history" checked={this.state.share_history} onChange={this.onShareHistoryChanged}/> Share message history with new users</label>
                         </div>
-                        <div>
+                        <div className="mx_CreateRoom_encrypt">
                             <label><input type="checkbox" ref="encrypt" checked={this.state.encrypt} onChange={this.onEncryptChanged}/> Encrypt room</label>
                         </div>
                         <div>
diff --git a/skins/base/views/organisms/RightPanel.js b/skins/base/views/organisms/RightPanel.js
index e5ca89c9..004ac557 100644
--- a/skins/base/views/organisms/RightPanel.js
+++ b/skins/base/views/organisms/RightPanel.js
@@ -52,7 +52,7 @@ module.exports = React.createClass({
         if (this.props.roomId) {
             buttonGroup =
                     <div className="mx_RightPanel_headerButtonGroup">
-                        <div className="mx_RightPanel_headerButton">
+                        <div className="mx_RightPanel_headerButton mx_RightPanel_filebutton">
                             <img src="img/file.png" width="32" height="32" alt="Files"/>
                         </div>
                         <div className="mx_RightPanel_headerButton" onClick={ this.onMemberListButtonClick }>
diff --git a/skins/base/views/organisms/RoomList.js b/skins/base/views/organisms/RoomList.js
index 7b3ab075..82e33573 100644
--- a/skins/base/views/organisms/RoomList.js
+++ b/skins/base/views/organisms/RoomList.js
@@ -30,15 +30,15 @@ module.exports = React.createClass({
     render: function() {
         return (
             <div className="mx_RoomList">
-                <h2>Favourites</h2>
+                <h2 className="mx_RoomList_favourites_label">Favourites</h2>
                 <RoomDropTarget text="Drop here to favourite"/>
 
-                <h2>Recents</h2>
+                <h2 className="mx_RoomList_recents_label">Recents</h2>
                 <div className="mx_RoomList_recents">
                     {this.makeRoomTiles()}
                 </div>
 
-                <h2>Archive</h2>
+                <h2 className="mx_RoomList_archive_label">Archive</h2>
                 <RoomDropTarget text="Drop here to archive"/>
             </div>
         );