diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index f03c63b371..431bdba5fa 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -155,7 +155,10 @@ module.exports = React.createClass({
                     panel = <MemberInfo roomId={this.props.roomId} member={this.state.member} key={this.props.roomId} />
                 }
             }
+        }
 
+        if (!panel) {
+            panel = <div className="mx_RightPanel_blank"></div>;
         }
 
         var classes = "mx_RightPanel mx_fadable";
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/SearchBox.css b/src/skins/vector/css/matrix-react-sdk/structures/SearchBox.css
index 8b9e98964f..ecd8c42985 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/SearchBox.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/SearchBox.css
@@ -54,7 +54,7 @@ limitations under the License.
 }
 
 .mx_SearchBox_maximise {
-    margin-left: 6px;
+    margin-left: 9px;
 }
 
 .mx_SearchBox object {
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css b/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css
index 4388142059..6ef69f1d3b 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css
@@ -50,9 +50,25 @@ limitations under the License.
     -webkit-flex: 1 1 0;
     flex: 1 1 0;
 
+    margin-top: -20px;
     overflow-y: auto;
 }
 
+.mx_UserSettings h3 {
+    clear: both;
+    margin-left: 63px;
+    text-transform: uppercase;
+    color: #3d3b39;
+    font-weight: 600;
+    font-size: 13px;
+    margin-top: 26px;
+    margin-bottom: 10px;
+}
+
+.mx_UserSettings_section h3 {
+    margin-left: 0px;
+}
+
 .mx_UserSettings_spinner {
     display: inline-block;
     vertical-align: middle;
@@ -78,22 +94,6 @@ limitations under the License.
     cursor: pointer;
 }
 
-.mx_UserSettings h2 {
-    clear: both;
-    margin-top: 32px;
-    margin-bottom: 8px;
-    margin-left: 63px;
-    padding-bottom: 6px;
-    border-bottom: 1px solid #e5e5e5;
-}
-
-.mx_UserSettings h3 {
-    font-weight: bold;
-    font-size: 15px;
-    margin-top: 4px;
-    margin-bottom: 4px;
-}
-
 .mx_UserSettings_section {
     margin-left: 63px;
     margin-top: 28px;
diff --git a/src/skins/vector/css/vector-web/structures/RightPanel.css b/src/skins/vector/css/vector-web/structures/RightPanel.css
index f6112da6e7..af8517b2b6 100644
--- a/src/skins/vector/css/vector-web/structures/RightPanel.css
+++ b/src/skins/vector/css/vector-web/structures/RightPanel.css
@@ -86,7 +86,8 @@ limitations under the License.
 }
 
 .mx_RightPanel .mx_MemberList,
-.mx_RightPanel .mx_MemberInfo {
+.mx_RightPanel .mx_MemberInfo,
+.mx_RightPanel_blank {
     -webkit-box-ordinal-group: 2;
     -moz-box-ordinal-group: 2;
     -ms-flex-order: 2;
diff --git a/src/skins/vector/img/maximise.svg b/src/skins/vector/img/maximise.svg
index 4df7d5bb02..79c6c0ab8b 100644
--- a/src/skins/vector/img/maximise.svg
+++ b/src/skins/vector/img/maximise.svg
@@ -3,9 +3,6 @@
 <svg version="1.1" id="Layer_1" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
 	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="-254 253 10 16"
 	 style="enable-background:new -254 253 10 16;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;stroke:#76CFA6;stroke-width:2;}
-</style>
 <title>minimise</title>
 <desc>Created with sketchtool.</desc>
 <g id="_x30_2-Chat" sketch:type="MSPage">
@@ -13,7 +10,7 @@
 		<g id="Room-list" sketch:type="MSLayerGroup">
 			<g id="Room-list_x2F_Header" sketch:type="MSShapeGroup">
 				<g id="minimise" transform="translate(172.000000, 25.000000)">
-					<path id="Path-53-Copy" class="st0" d="M-248.7,256.3l5.7,5.7l-5.7,5.7"/>
+					<path id="Path-53-Copy" fill="none" stroke-width="2" stroke="#76CFA6" d="M-248.7,256.3l5.7,5.7l-5.7,5.7"/>
 				</g>
 			</g>
 		</g>