diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss
index ff5b5f0dc15..972eb9197f0 100644
--- a/res/css/views/right_panel/_VerificationPanel.scss
+++ b/res/css/views/right_panel/_VerificationPanel.scss
@@ -23,7 +23,31 @@ limitations under the License.
     }
 }
 
-.mx_UserInfo {
+.mx_UserInfo.mx_BaseCard {
+    .mx_UserInfo_container:not(.mx_UserInfo_separator) {
+
+        > div > p {
+            margin-top: 0;
+            margin-bottom: 0;
+        }
+
+        .mx_VerificationPanel_verifyByEmojiButton,
+        .mx_UserInfo_wideButton {
+            width: fit-content;
+        }
+
+        .mx_EncryptionInfo_spinner,
+        .mx_VerificationShowSas {
+            margin-inline-start: auto;
+            margin-inline-end: auto;
+        }
+
+        .mx_Spinner,
+        .mx_VerificationShowSas {
+            align-items: center;
+        }
+    }
+
     .mx_EncryptionPanel_cancel {
         @mixin customisedCancelButton;
         width: 14px;
diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
index 7b45746c770..f1c956bb8f3 100644
--- a/src/components/views/right_panel/UserInfo.tsx
+++ b/src/components/views/right_panel/UserInfo.tsx
@@ -249,7 +249,7 @@ function DevicesSection({ devices, userId, loading }: { devices: IDevice[], user
         return <Spinner />;
     }
     if (devices === null) {
-        return <>{ _t("Unable to load session list") }</>;
+        return <p>{ _t("Unable to load session list") }</p>;
     }
     const isMe = userId === cli.getUserId();
     const deviceTrusts = devices.map(d => cli.checkDeviceTrust(userId, d.deviceId));