diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index f4f0a8f332..f700746f0d 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -127,12 +127,12 @@ module.exports = React.createClass({
             buttonGroup =
                     <div className="mx_RightPanel_headerButtonGroup">
                         <div className="mx_RightPanel_headerButton" onClick={ this.onMemberListButtonClick }>
-                            <img src="img/members.svg" width="17" height="22" title="Members" alt="Members"/>
+                            <object type="image/svg+xml" data="img/members.svg" width="17" height="22" title="Members"/>
                             { membersBadge }
                             { membersHighlight }
                         </div>
                         <div className="mx_RightPanel_headerButton mx_RightPanel_filebutton">
-                            <img src="img/files.svg" width="17" height="22" title="Files" alt="Files"/>
+                            <object type="image/svg+xml" data="img/files.svg" width="17" height="22" title="Files"/>
                             { filesHighlight }
                         </div>
                     </div>;
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
index 3ec5bbdcd0..a4fde97a43 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
@@ -199,6 +199,10 @@ limitations under the License.
     cursor: pointer;
 }
 
+.mx_RoomView_voipButton object {
+    pointer-events: none;
+}
+
 .mx_RoomView_unreadMessagesBar {
     color: #ff0064;
     cursor: pointer;
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css
index 4d5668518d..133e3b7bd7 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css
@@ -82,6 +82,13 @@ limitations under the License.
     cursor: pointer;
 }
 
+.mx_MessageComposer_upload object,
+.mx_MessageComposer_hangup object,
+.mx_MessageComposer_voicecall object,
+.mx_MessageComposer_videocall object {
+    pointer-events: none;
+}
+
 .mx_MessageComposer_videocall {
     padding-right: 10px;
     padding-top: 4px;
@@ -92,6 +99,6 @@ limitations under the License.
     padding-top: 4px;
 }
 
-.mx_MessageComposer_upload img {
+.mx_MessageComposer_upload object {
     margin-top: 5px;
 }
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css
index 0443684128..23e309157b 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css
@@ -138,6 +138,10 @@ limitations under the License.
     left: 4px;
 }
 
+.mx_RoomHeader_settingsButton object {
+    pointer-events: none;
+}
+
 .mx_RoomHeader_leftRow:hover .mx_RoomHeader_name {
     color: #76cfa6;
 }
@@ -203,10 +207,11 @@ limitations under the License.
     vertical-align: top;
     padding-left: 8px;
     padding-right: 8px;
+    cursor: pointer;
 }
 
-.mx_RoomHeader_button img {
-    cursor: pointer;
+.mx_RoomHeader_button object {
+    pointer-events: none;
 }
 
 .mx_RoomHeader_voipButton {
diff --git a/src/skins/vector/css/vector-web/structures/RightPanel.css b/src/skins/vector/css/vector-web/structures/RightPanel.css
index 645a626314..eecdd0658c 100644
--- a/src/skins/vector/css/vector-web/structures/RightPanel.css
+++ b/src/skins/vector/css/vector-web/structures/RightPanel.css
@@ -55,6 +55,10 @@ limitations under the License.
     position: relative;
 }
 
+.mx_RightPanel_headerButton object {
+    pointer-events: none;
+}
+
 .mx_RightPanel_headerButton_highlight {
     position: absolute;
     bottom: -2px;