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 a0e9052c..11d266b4 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css
@@ -33,7 +33,6 @@ limitations under the License.
     display: inline;
     vertical-align: middle;
     border: 0px;
-    height: 36px;
     border-radius: 36px;
     font-weight: 400;
     font-size: 16px;
@@ -121,37 +120,27 @@ limitations under the License.
 }
 
 .mx_UserSettings_logout {
-    margin-right: 24px;
-    margin-bottom: 24px;
-    margin-left: 63px;
+    float: right;
+    margin-right: 32px;
+    margin-left: 32px;
 }
 
 .mx_UserSettings_avatarPicker {
-    width: 320px;
+    margin-left: 32px;
+    margin-right: 32px;
     float: right;
-}
-
-.mx_UserSettings_avatarPicker_edit {
-    position: relative;
-    left: 50%;
-    display: inline-block;
-    margin-top: 10px;
-}
-
-.mx_UserSettings_avatarPicker_edit > input{
-    display: none;
-}
-
-.mx_UserSettings_avatarPicker_edit > label {
     cursor: pointer;
 }
 
-.mx_UserSettings_avatarPicker_img {
-    margin: 0 auto;
-    width: 75%;
+.mx_UserSettings_avatarPicker .mx_RoomAvatar {
+    border-radius: 40px;
 }
 
-.mx_UserSettings_avatarPicker_img > img {
-    display: block;
-    margin: 0 auto;
+.mx_UserSettings_avatarPicker_edit {
+    text-align: center;
+    margin-top: 10px;
+}
+
+.mx_UserSettings_avatarPicker_edit > input {
+    display: none;
 }