diff --git a/skins/base/css/molecules/RoomHeader.css b/skins/base/css/molecules/RoomHeader.css
index f79a3afffd..d8cb259655 100644
--- a/skins/base/css/molecules/RoomHeader.css
+++ b/skins/base/css/molecules/RoomHeader.css
@@ -148,3 +148,7 @@ limitations under the License.
     padding-left: 8px;
     padding-right: 8px;
 }
+
+.mx_RoomHeader_button img {
+    cursor: pointer;
+}
diff --git a/skins/base/css/organisms/RightPanel.css b/skins/base/css/organisms/RightPanel.css
index 6ee7f6ffdf..30ef47264a 100644
--- a/skins/base/css/organisms/RightPanel.css
+++ b/skins/base/css/organisms/RightPanel.css
@@ -50,6 +50,7 @@ limitations under the License.
 }
 
 .mx_RightPanel_headerButton {
+    cursor: pointer;
     height: 48px;
     display: table-cell;
     vertical-align: middle;    
diff --git a/skins/base/views/molecules/BottomLeftMenu.js b/skins/base/views/molecules/BottomLeftMenu.js
index d2340d7bfa..be46febc2e 100644
--- a/skins/base/views/molecules/BottomLeftMenu.js
+++ b/skins/base/views/molecules/BottomLeftMenu.js
@@ -44,19 +44,19 @@ module.exports = React.createClass({
                 <div className="mx_BottomLeftMenu_options">
                     <div className="mx_RoomTile" onClick={this.onCreateRoomClick}>
                         <div className="mx_RoomTile_avatar">
-                            <img src="img/create-big.png" width="42" height="42"/>
+                            <img src="img/create-big.png" alt="Create new room" title="Create new room" width="42" height="42"/>
                         </div>
                         <div className="mx_RoomTile_name">Create new room</div>
                     </div>
                     <div className="mx_RoomTile" onClick={this.onRoomDirectoryClick}>
                         <div className="mx_RoomTile_avatar">
-                            <img src="img/directory-big.png" width="42" height="42"/>
+                            <img src="img/directory-big.png" alt="Directory" title="Directory" width="42" height="42"/>
                         </div>
                         <div className="mx_RoomTile_name">Directory</div>
                     </div>
                     <div className="mx_RoomTile" onClick={this.onSettingsClick}>
                         <div className="mx_RoomTile_avatar">
-                            <img src="img/settings-big.png" width="42" height="42"/>
+                            <img src="img/settings-big.png" alt="Settings" title="Settings" width="42" height="42"/>
                         </div>
                         <div className="mx_RoomTile_name">Settings</div>
                     </div>
diff --git a/skins/base/views/molecules/RoomHeader.js b/skins/base/views/molecules/RoomHeader.js
index 5e11124323..cb481454da 100644
--- a/skins/base/views/molecules/RoomHeader.js
+++ b/skins/base/views/molecules/RoomHeader.js
@@ -105,13 +105,13 @@ module.exports = React.createClass({
                     <div className="mx_RoomHeader_rightRow">
                         { settings_button }
                         <div className="mx_RoomHeader_button mx_RoomHeader_search">
-                            <img src="img/search.png" width="32" height="32"/>
+                            <img src="img/search.png" title="Search" alt="Search" width="32" height="32"/>
                         </div>
                         <div className="mx_RoomHeader_button mx_RoomHeader_video" onClick={this.onVideoClick}>
-                            <img src="img/video.png" width="32" height="32"/>
+                            <img src="img/video.png" title="Video call" alt="Video call" width="32" height="32"/>
                         </div>
                         <div className="mx_RoomHeader_button mx_RoomHeader_voice" onClick={this.onVoiceClick}>
-                            <img src="img/voip.png" width="32" height="32"/>
+                            <img src="img/voip.png" title="VoIP call" alt="VoIP call" width="32" height="32"/>
                         </div>
                     </div>
                 </div>
diff --git a/skins/base/views/organisms/RightPanel.js b/skins/base/views/organisms/RightPanel.js
index 004ac55733..5123691e3e 100644
--- a/skins/base/views/organisms/RightPanel.js
+++ b/skins/base/views/organisms/RightPanel.js
@@ -53,10 +53,10 @@ module.exports = React.createClass({
             buttonGroup =
                     <div className="mx_RightPanel_headerButtonGroup">
                         <div className="mx_RightPanel_headerButton mx_RightPanel_filebutton">
-                            <img src="img/file.png" width="32" height="32" alt="Files"/>
+                            <img src="img/file.png" width="32" height="32" title="Files" alt="Files"/>
                         </div>
                         <div className="mx_RightPanel_headerButton" onClick={ this.onMemberListButtonClick }>
-                            <img src="img/members.png" width="32" height="32" alt="Members"/>
+                            <img src="img/members.png" width="32" height="32" title="Members" alt="Members"/>
                         </div>
                     </div>;