diff --git a/src/skins/vector/css/organisms/RightPanel.css b/src/skins/vector/css/organisms/RightPanel.css
index 2a8f486b..86f6cd1b 100644
--- a/src/skins/vector/css/organisms/RightPanel.css
+++ b/src/skins/vector/css/organisms/RightPanel.css
@@ -43,22 +43,22 @@ limitations under the License.
     margin-top: 32px;
     float: left;
     background-color: #fff;
-    margin-left: 3px;
+    margin-left: -4px;
 }
 
 .mx_RightPanel_headerButton {
     cursor: pointer;
     display: table-cell;
     vertical-align: middle;    
-    padding-left: 8px;
-    padding-right: 8px;
+    padding-left: 15px;
+    padding-right: 15px;
     position: relative;
 }
 
 .mx_RightPanel_headerButton_highlight {
-    position: relative;
-    bottom: 0px;
-    left: -4px;
+    position: absolute;
+    bottom: -2px;
+    left: 10px;
     width: 25px;
     height: 4px;
     background-color: #76cfa6;
diff --git a/src/skins/vector/views/organisms/RightPanel.js b/src/skins/vector/views/organisms/RightPanel.js
index 9dc3f540..bcfeba57 100644
--- a/src/skins/vector/views/organisms/RightPanel.js
+++ b/src/skins/vector/views/organisms/RightPanel.js
@@ -66,7 +66,7 @@ module.exports = React.createClass({
         }
 
         var membersBadge;
-        if (this.state.phase == this.Phase.MemberList) {
+        if (this.state.phase == this.Phase.MemberList && this.props.roomId) {
             var cli = MatrixClientPeg.get();
             var room = cli.getRoom(this.props.roomId);
             // FIXME: presumably we need to subscribe to some event to refresh this count when it changes?
@@ -82,7 +82,7 @@ module.exports = React.createClass({
                             { membersHighlight }
                         </div>
                         <div className="mx_RightPanel_headerButton mx_RightPanel_filebutton">
-                            <img src="img/file.png" width="17" height="22" title="Files" alt="Files"/>
+                            <img src="img/files.png" width="17" height="22" title="Files" alt="Files"/>
                             { filesHighlight }
                         </div>
                     </div>;