diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index db08fe18bf..aee0252c4e 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -22,13 +22,6 @@ limitations under the License.
     overflow-y: auto;
 }
 
-.mx_UserInfo_profile .mx_E2EIcon {
-    display: inline;
-    margin: auto;
-    padding-right: 25px;
-    mask-size: contain;
-}
-
 .mx_UserInfo_cancel {
     height: 16px;
     width: 16px;
@@ -41,16 +34,10 @@ limitations under the License.
     position: absolute;
 }
 
-.mx_UserInfo_profile h2 {
-    flex: 1;
-    overflow-x: auto;
-    max-height: 50px;
-}
-
 .mx_UserInfo h2 {
     font-size: 18px;
     font-weight: 600;
-    margin: 16px 0 8px 0;
+    margin: 0;
 }
 
 .mx_UserInfo_container {
@@ -76,6 +63,7 @@ limitations under the License.
 
 .mx_UserInfo_avatar {
     margin: 24px 32px 0 32px;
+    cursor: pointer;
 }
 
 .mx_UserInfo_avatar > div {
@@ -110,12 +98,30 @@ limitations under the License.
     margin: 4px 0;
 }
 
-.mx_UserInfo_profileField {
-    font-size: 15px;
-    position: relative;
+.mx_UserInfo_profile {
+    font-size: 12px;
     text-align: center;
+
+    h2 {
+        flex: 1;
+        overflow-x: auto;
+        max-height: 50px;
+        display: flex;
+        justify-self: ;
+        justify-content: center;
+        align-items: center;
+
+        .mx_E2EIcon {
+            margin: 5px;
+        }
+    }
+
+    .mx_UserInfo_profileStatus {
+        margin-top: 12px;
+    }
 }
 
+
 .mx_UserInfo_memberDetails {
     text-align: center;
 }
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index e55aae74f5..43c5833faa 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1157,7 +1157,7 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room
 
     let e2eIcon;
     if (isRoomEncrypted && devices) {
-        e2eIcon = <E2EIcon status={_getE2EStatus(devices)} isUser={true} />;
+        e2eIcon = <E2EIcon size={18} status={_getE2EStatus(devices)} isUser={true} />;
     }
 
     return (
@@ -1167,16 +1167,14 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room
 
             <div className="mx_UserInfo_container">
                 <div className="mx_UserInfo_profile">
-                    <div className="mx_UserInfo_profileField">
-                        <h2>
+                    <div >
+                        <h2 aria-label={displayName}>
                             { e2eIcon }
                             { displayName }
                         </h2>
                     </div>
-                    <div className="mx_UserInfo_profileField">
-                        { user.userId }
-                    </div>
-                    <div className="mx_UserInfo_profileField">
+                    <div>{ user.userId }</div>
+                    <div className="mx_UserInfo_profileStatus">
                         {presenceLabel}
                         {statusLabel}
                     </div>