diff --git a/Riot/ViewController/ContactDetailsViewController.h b/Riot/ViewController/ContactDetailsViewController.h
index 725f86f27..f00dbe3af 100644
--- a/Riot/ViewController/ContactDetailsViewController.h
+++ b/Riot/ViewController/ContactDetailsViewController.h
@@ -34,6 +34,7 @@ typedef enum : NSUInteger
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *contactAvatarHeaderBackgroundHeightConstraint;
 
 @property (weak, nonatomic) IBOutlet UIView *headerView;
+@property (weak, nonatomic) IBOutlet MXKImageView *contactAvatar;
 @property (weak, nonatomic) IBOutlet UIView *contactAvatarMask;
 @property (weak, nonatomic) IBOutlet UILabel *contactNameLabel;
 @property (weak, nonatomic) IBOutlet UIView *contactNameLabelMask;
diff --git a/Riot/ViewController/ContactDetailsViewController.m b/Riot/ViewController/ContactDetailsViewController.m
index 1b69d4a10..e5fc06fc9 100644
--- a/Riot/ViewController/ContactDetailsViewController.m
+++ b/Riot/ViewController/ContactDetailsViewController.m
@@ -38,7 +38,6 @@
 @interface ContactDetailsViewController () <RoomMemberTitleViewDelegate>
 {
     RoomMemberTitleView* contactTitleView;
-    MXKImageView *contactAvatar;
     
     // HTTP Request
     MXHTTPOperation *roomCreationRequest;
@@ -134,9 +133,9 @@
     
     contactTitleView = [RoomMemberTitleView roomMemberTitleView];
     contactTitleView.delegate = self;
-    contactAvatar = contactTitleView.memberAvatar;
-    contactAvatar.contentMode = UIViewContentModeScaleAspectFill;
-    contactAvatar.defaultBackgroundColor = [UIColor clearColor];
+    
+    self.contactAvatar.contentMode = UIViewContentModeScaleAspectFill;
+    self.contactAvatar.defaultBackgroundColor = [UIColor clearColor];
     
     if (@available(iOS 11.0, *))
     {
@@ -194,17 +193,16 @@
     [tap setNumberOfTouchesRequired:1];
     [tap setNumberOfTapsRequired:1];
     [tap setDelegate:self];
-    [contactAvatar addGestureRecognizer:tap];
-    contactAvatar.userInteractionEnabled = YES;
-
-    // Need to listen tap gesture on the area part of the avatar image that is outside
-    // of the navigation bar, its parent but smaller view.
+    [self.contactAvatarMask addGestureRecognizer:tap];
+    self.contactAvatarMask.userInteractionEnabled = YES;
+    
+    // Need to listen to the tap gesture in the title view too.
     tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTapGesture:)];
     [tap setNumberOfTouchesRequired:1];
     [tap setNumberOfTapsRequired:1];
     [tap setDelegate:self];
-    [self.contactAvatarMask addGestureRecognizer:tap];
-    self.contactAvatarMask.userInteractionEnabled = YES;
+    [contactTitleView.memberAvatarMask addGestureRecognizer:tap];
+    contactTitleView.memberAvatarMask.userInteractionEnabled = YES;
     
     // Register collection view cell class
     [self.tableView registerClass:TableViewCellWithButton.class forCellReuseIdentifier:[TableViewCellWithButton defaultReuseIdentifier]];
@@ -368,10 +366,10 @@
     {
         // Adjust the header height by taking into account the actual position of the member avatar in title view
         // This position depends automatically on the screen orientation.
-        CGRect memberAvatarFrame = contactTitleView.memberAvatar.frame;
-        CGPoint memberAvatarActualPosition = [contactTitleView convertPoint:memberAvatarFrame.origin toView:self.view];
+        CGPoint memberAvatarOriginInTitleView = contactTitleView.memberAvatarMask.frame.origin;
+        CGPoint memberAvatarActualPosition = [contactTitleView convertPoint:memberAvatarOriginInTitleView toView:self.view];
         
-        CGFloat avatarHeaderHeight = memberAvatarActualPosition.y + memberAvatarFrame.size.height;
+        CGFloat avatarHeaderHeight = memberAvatarActualPosition.y + self.contactAvatar.frame.size.height;
         if (_contactAvatarHeaderBackgroundHeightConstraint.constant != avatarHeaderHeight)
         {
             _contactAvatarHeaderBackgroundHeightConstraint.constant = avatarHeaderHeight;
@@ -496,7 +494,7 @@
 
 - (void)refreshContactThumbnail
 {
-    UIImage* image = [_contact thumbnailWithPreferedSize:contactAvatar.frame.size];
+    UIImage* image = [_contact thumbnailWithPreferedSize:self.contactAvatar.frame.size];
     
     if (!image)
     {
@@ -512,9 +510,9 @@
         }
     }
     
-    contactAvatar.image = image;
-    [contactAvatar.layer setCornerRadius:contactAvatar.frame.size.width / 2];
-    [contactAvatar setClipsToBounds:YES];
+    self.contactAvatar.image = image;
+    [self.contactAvatar.layer setCornerRadius:self.contactAvatar.frame.size.width / 2];
+    [self.contactAvatar setClipsToBounds:YES];
 }
 
 - (void)refreshContactDisplayName
@@ -1148,7 +1146,7 @@
             self.contactNameLabel.text = _contact.displayName;
         }
     }
-    else if (view == contactAvatar || view == self.contactAvatarMask)
+    else if (view == contactTitleView.memberAvatarMask || view == self.contactAvatarMask)
     {
         // Show the avatar in full screen
         __block MXKImageView * avatarFullScreenView = [[MXKImageView alloc] initWithFrame:CGRectZero];
@@ -1177,7 +1175,7 @@
         [avatarFullScreenView setImageURL:avatarURL
                                  withType:nil
                       andImageOrientation:UIImageOrientationUp
-                             previewImage:contactAvatar.image];
+                             previewImage:self.contactAvatar.image];
 
         [avatarFullScreenView showFullScreen];
         isStatusBarHidden = YES;
diff --git a/Riot/ViewController/ContactDetailsViewController.xib b/Riot/ViewController/ContactDetailsViewController.xib
index 1cc0340ff..84470cb2e 100644
--- a/Riot/ViewController/ContactDetailsViewController.xib
+++ b/Riot/ViewController/ContactDetailsViewController.xib
@@ -1,17 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1108" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ContactDetailsViewController">
             <connections>
                 <outlet property="bottomImageView" destination="7Dc-jk-9sT" id="BVN-bt-VXI"/>
+                <outlet property="contactAvatar" destination="HFg-gC-lBP" id="CII-Wb-38w"/>
                 <outlet property="contactAvatarHeaderBackground" destination="ouj-VM-zdT" id="bEq-oW-fal"/>
                 <outlet property="contactAvatarHeaderBackgroundHeightConstraint" destination="dBL-G6-Yec" id="WWx-dy-WtS"/>
                 <outlet property="contactAvatarMask" destination="xHv-tg-mOt" id="lX8-ju-K6W"/>
@@ -41,10 +43,23 @@
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xHv-tg-mOt">
                             <rect key="frame" x="137.5" y="0.0" width="100" height="125"/>
+                            <subviews>
+                                <view clipsSubviews="YES" contentMode="scaleAspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="HFg-gC-lBP" customClass="MXKImageView">
+                                    <rect key="frame" x="7.5" y="31" width="84" height="84"/>
+                                    <color key="backgroundColor" red="0.6886889638" green="1" blue="0.74383144840000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <accessibility key="accessibilityConfiguration" identifier="MemberAvatar"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" secondItem="HFg-gC-lBP" secondAttribute="height" multiplier="1:1" id="EMi-8B-uQv"/>
+                                        <constraint firstAttribute="width" constant="84" id="ugh-Rg-dGz"/>
+                                    </constraints>
+                                </view>
+                            </subviews>
                             <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                             <accessibility key="accessibilityConfiguration" identifier="ContactDetailsVCAvatarMask"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="100" id="5BQ-kA-kNt"/>
+                                <constraint firstItem="HFg-gC-lBP" firstAttribute="centerX" secondItem="xHv-tg-mOt" secondAttribute="centerX" id="FGc-kn-wNk"/>
+                                <constraint firstAttribute="bottom" secondItem="HFg-gC-lBP" secondAttribute="bottom" constant="10" id="wfW-Ky-Kfc"/>
                             </constraints>
                         </view>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="92g-hC-6jB">
diff --git a/Riot/ViewController/RoomMemberDetailsViewController.m b/Riot/ViewController/RoomMemberDetailsViewController.m
index c0c004ca0..b65ae959a 100644
--- a/Riot/ViewController/RoomMemberDetailsViewController.m
+++ b/Riot/ViewController/RoomMemberDetailsViewController.m
@@ -166,9 +166,6 @@
         [NSLayoutConstraint activateConstraints:@[topConstraint, bottomConstraint, leadingConstraint, trailingConstraint]];
     }
     
-    // Handle the member avatar at the view controller level.
-    self.memberThumbnail = memberTitleView.memberAvatar;
-    
     // Add tap gesture on member's name
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTapGesture:)];
     [tap setNumberOfTouchesRequired:1];
@@ -182,17 +179,16 @@
     [tap setNumberOfTouchesRequired:1];
     [tap setNumberOfTapsRequired:1];
     [tap setDelegate:self];
-    [self.memberThumbnail addGestureRecognizer:tap];
-    self.memberThumbnail.userInteractionEnabled = YES;
-
-    // Need to listen tap gesture on the area part of the avatar image that is outside
-    // of the navigation bar, its parent but smaller view.
+    [self.roomMemberAvatarMask addGestureRecognizer:tap];
+    self.roomMemberAvatarMask.userInteractionEnabled = YES;
+    
+    // Need to listen to the tap gesture in the title view too.
     tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTapGesture:)];
     [tap setNumberOfTouchesRequired:1];
     [tap setNumberOfTapsRequired:1];
     [tap setDelegate:self];
-    [self.roomMemberAvatarMask addGestureRecognizer:tap];
-    self.roomMemberAvatarMask.userInteractionEnabled = YES;
+    [memberTitleView.memberAvatarMask addGestureRecognizer:tap];
+    memberTitleView.memberAvatarMask.userInteractionEnabled = YES;
     
     // Register collection view cell class
     [self.tableView registerClass:TableViewCellWithButton.class forCellReuseIdentifier:[TableViewCellWithButton defaultReuseIdentifier]];
@@ -341,10 +337,10 @@
     {
         // Adjust the header height by taking into account the actual position of the member avatar in title view
         // This position depends automatically on the screen orientation.
-        CGRect memberAvatarFrame = memberTitleView.memberAvatar.frame;
-        CGPoint memberAvatarActualPosition = [memberTitleView convertPoint:memberAvatarFrame.origin toView:self.view];
+        CGPoint memberAvatarOriginInTitleView = memberTitleView.memberAvatarMask.frame.origin;
+        CGPoint memberAvatarActualPosition = [memberTitleView convertPoint:memberAvatarOriginInTitleView toView:self.view];
         
-        CGFloat avatarHeaderHeight = memberAvatarActualPosition.y + memberAvatarFrame.size.height;
+        CGFloat avatarHeaderHeight = memberAvatarActualPosition.y + self.memberThumbnail.frame.size.height;
         if (_roomMemberAvatarHeaderBackgroundHeightConstraint.constant != avatarHeaderHeight)
         {
             _roomMemberAvatarHeaderBackgroundHeightConstraint.constant = avatarHeaderHeight;
@@ -955,7 +951,7 @@
             self.roomMemberNameLabel.text = self.mxRoomMember.displayname;
         }
     }
-    else if (view == self.memberThumbnail || view == self.roomMemberAvatarMask)
+    else if (view == memberTitleView.memberAvatarMask || view == self.roomMemberAvatarMask)
     {
         __weak typeof(self) weakSelf = self;
         
diff --git a/Riot/ViewController/RoomMemberDetailsViewController.xib b/Riot/ViewController/RoomMemberDetailsViewController.xib
index 729773b9b..5542ed7fe 100644
--- a/Riot/ViewController/RoomMemberDetailsViewController.xib
+++ b/Riot/ViewController/RoomMemberDetailsViewController.xib
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1108" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -13,6 +14,7 @@
             <connections>
                 <outlet property="bottomImageView" destination="7Dc-jk-9sT" id="BVN-bt-VXI"/>
                 <outlet property="memberHeaderView" destination="YXr-As-Mqh" id="Eqb-qr-iAo"/>
+                <outlet property="memberThumbnail" destination="GQ1-rP-ckr" id="abr-hr-C3p"/>
                 <outlet property="roomMemberAvatarHeaderBackground" destination="ouj-VM-zdT" id="YeD-zt-8y5"/>
                 <outlet property="roomMemberAvatarHeaderBackgroundHeightConstraint" destination="dBL-G6-Yec" id="QXZ-ZP-0Rn"/>
                 <outlet property="roomMemberAvatarMask" destination="MAS-3M-3cg" id="nLI-7d-5Hu"/>
@@ -41,9 +43,22 @@
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MAS-3M-3cg">
                             <rect key="frame" x="137.5" y="0.0" width="100" height="125"/>
+                            <subviews>
+                                <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GQ1-rP-ckr" customClass="MXKImageView">
+                                    <rect key="frame" x="7.5" y="31" width="84" height="84"/>
+                                    <color key="backgroundColor" red="0.6886889638" green="1" blue="0.74383144840000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <accessibility key="accessibilityConfiguration" identifier="MemberAvatar"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="84" id="HfP-Pj-zLa"/>
+                                        <constraint firstAttribute="width" secondItem="GQ1-rP-ckr" secondAttribute="height" multiplier="1:1" id="a1T-Y0-Iic"/>
+                                    </constraints>
+                                </view>
+                            </subviews>
                             <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                             <accessibility key="accessibilityConfiguration" identifier="RoomMemberDetailsVCAvatarMask"/>
                             <constraints>
+                                <constraint firstAttribute="bottom" secondItem="GQ1-rP-ckr" secondAttribute="bottom" constant="10" id="3pC-So-WvO"/>
+                                <constraint firstItem="GQ1-rP-ckr" firstAttribute="centerX" secondItem="MAS-3M-3cg" secondAttribute="centerX" id="ZGI-nR-gGx"/>
                                 <constraint firstAttribute="width" constant="100" id="fwv-qE-IV1"/>
                             </constraints>
                         </view>
@@ -82,13 +97,11 @@
                         <constraint firstItem="wEo-Mk-SgZ" firstAttribute="centerY" secondItem="92g-hC-6jB" secondAttribute="centerY" id="3Zt-MD-sZK"/>
                         <constraint firstItem="5le-5e-Vml" firstAttribute="top" secondItem="92g-hC-6jB" secondAttribute="bottom" constant="7" id="5zX-1T-n38"/>
                         <constraint firstItem="92g-hC-6jB" firstAttribute="centerX" secondItem="YXr-As-Mqh" secondAttribute="centerX" id="7Is-d0-FZp"/>
-                        <constraint firstItem="MAS-3M-3cg" firstAttribute="centerY" secondItem="YXr-As-Mqh" secondAttribute="centerY" id="Ciw-T9-XBe"/>
                         <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="92g-hC-6jB" secondAttribute="trailing" constant="32" id="Eyx-UF-fYc"/>
                         <constraint firstAttribute="trailing" secondItem="ouj-VM-zdT" secondAttribute="trailing" id="FRy-TL-gS2"/>
                         <constraint firstItem="wEo-Mk-SgZ" firstAttribute="centerX" secondItem="92g-hC-6jB" secondAttribute="centerX" id="K1f-RX-kpp"/>
                         <constraint firstItem="wEo-Mk-SgZ" firstAttribute="width" secondItem="YXr-As-Mqh" secondAttribute="width" id="P5e-q6-OIS"/>
                         <constraint firstItem="92g-hC-6jB" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="YXr-As-Mqh" secondAttribute="leading" constant="32" id="QZB-ue-Sih"/>
-                        <constraint firstItem="MAS-3M-3cg" firstAttribute="centerY" secondItem="YXr-As-Mqh" secondAttribute="centerY" id="Vh6-q9-uJZ"/>
                         <constraint firstItem="5le-5e-Vml" firstAttribute="centerX" secondItem="YXr-As-Mqh" secondAttribute="centerX" id="bmA-Fq-uxO"/>
                         <constraint firstItem="5le-5e-Vml" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="YXr-As-Mqh" secondAttribute="leading" constant="42" id="ioz-jk-jrE"/>
                         <constraint firstAttribute="bottom" secondItem="5le-5e-Vml" secondAttribute="bottom" constant="18" id="j10-rX-tMf"/>
@@ -99,15 +112,7 @@
                         <constraint firstItem="MAS-3M-3cg" firstAttribute="bottom" secondItem="92g-hC-6jB" secondAttribute="top" id="rgU-C1-YMW"/>
                         <constraint firstItem="ouj-VM-zdT" firstAttribute="top" secondItem="YXr-As-Mqh" secondAttribute="top" id="srY-tD-AhJ"/>
                         <constraint firstItem="MAS-3M-3cg" firstAttribute="centerX" secondItem="YXr-As-Mqh" secondAttribute="centerX" id="vNM-7Z-K2b"/>
-                        <constraint firstAttribute="bottom" secondItem="MAS-3M-3cg" secondAttribute="bottom" id="xEt-kv-tJd"/>
                     </constraints>
-                    <variation key="default">
-                        <mask key="constraints">
-                            <exclude reference="Ciw-T9-XBe"/>
-                            <exclude reference="Vh6-q9-uJZ"/>
-                            <exclude reference="xEt-kv-tJd"/>
-                        </mask>
-                    </variation>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RBF-EK-dhz">
                     <rect key="frame" x="0.0" y="317" width="375" height="33"/>
diff --git a/Riot/Views/RoomMember/RoomMemberTitleView.h b/Riot/Views/RoomMember/RoomMemberTitleView.h
index 302160d31..e81d3faf7 100644
--- a/Riot/Views/RoomMember/RoomMemberTitleView.h
+++ b/Riot/Views/RoomMember/RoomMemberTitleView.h
@@ -48,9 +48,9 @@
  */
 + (instancetype)roomMemberTitleView;
 
-@property (weak, nonatomic) IBOutlet MXKImageView *memberAvatar;
+@property (weak, nonatomic) IBOutlet UIView *memberAvatarMask;
 @property (weak, nonatomic) IBOutlet UIImageView *memberBadge;
-@property (weak, nonatomic) IBOutlet NSLayoutConstraint *memberAvatarCenterXConstraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *memberAvatarMaskCenterXConstraint;
 
 /**
  The delegate.
diff --git a/Riot/Views/RoomMember/RoomMemberTitleView.m b/Riot/Views/RoomMember/RoomMemberTitleView.m
index 7eabc79fa..573537398 100644
--- a/Riot/Views/RoomMember/RoomMemberTitleView.m
+++ b/Riot/Views/RoomMember/RoomMemberTitleView.m
@@ -85,7 +85,7 @@
                 CGSize navBarSize = navigationBar.frame.size;
                 CGFloat superviewCenterX = frame.origin.x + (frame.size.width / 2);
                 
-                self.memberAvatarCenterXConstraint.constant = (navBarSize.width / 2) - superviewCenterX;
+                self.memberAvatarMaskCenterXConstraint.constant = (navBarSize.width / 2) - superviewCenterX;
             }
         }
     }
diff --git a/Riot/Views/RoomMember/RoomMemberTitleView.xib b/Riot/Views/RoomMember/RoomMemberTitleView.xib
index 596748eb0..b86be3ba7 100644
--- a/Riot/Views/RoomMember/RoomMemberTitleView.xib
+++ b/Riot/Views/RoomMember/RoomMemberTitleView.xib
@@ -1,51 +1,50 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1108" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="BkF-x3-7fX" customClass="RoomMemberTitleView">
-            <rect key="frame" x="0.0" y="0.0" width="600" height="117"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
-                <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7U9-Y6-cEm" customClass="MXKImageView">
-                    <rect key="frame" x="258" y="11" width="84" height="84"/>
-                    <color key="backgroundColor" red="0.6886889638" green="1" blue="0.74383144840000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    <accessibility key="accessibilityConfiguration" identifier="MemberAvatar"/>
-                    <constraints>
-                        <constraint firstAttribute="width" secondItem="7U9-Y6-cEm" secondAttribute="height" multiplier="1:1" id="9ct-O9-7am"/>
-                        <constraint firstAttribute="width" constant="84" id="BeT-JY-cq1"/>
-                    </constraints>
-                </view>
                 <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="f6h-pw-FvU">
-                    <rect key="frame" x="322" y="6" width="30" height="32"/>
+                    <rect key="frame" x="209" y="6" width="30" height="32"/>
                     <accessibility key="accessibilityConfiguration" identifier="MemberBadge"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="30" id="Rz8-gR-gAm"/>
                         <constraint firstAttribute="height" constant="32" id="dHM-zo-WVT"/>
                     </constraints>
                 </imageView>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VJM-ib-LUP">
+                    <rect key="frame" x="132" y="11" width="110" height="33"/>
+                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                    <accessibility key="accessibilityConfiguration" identifier="RoomMemberDetailsVCAvatarMask"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="110" id="IYH-gQ-dbK"/>
+                    </constraints>
+                </view>
             </subviews>
             <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
             <accessibility key="accessibilityConfiguration" identifier="RoomMemberTitleView"/>
             <constraints>
-                <constraint firstItem="7U9-Y6-cEm" firstAttribute="centerX" secondItem="BkF-x3-7fX" secondAttribute="centerX" id="C5g-ho-90L"/>
-                <constraint firstItem="7U9-Y6-cEm" firstAttribute="top" secondItem="BkF-x3-7fX" secondAttribute="top" constant="11" id="Kwt-Sd-REk"/>
-                <constraint firstItem="f6h-pw-FvU" firstAttribute="trailing" secondItem="7U9-Y6-cEm" secondAttribute="trailing" constant="10" id="V4L-tJ-obt"/>
-                <constraint firstItem="7U9-Y6-cEm" firstAttribute="top" secondItem="f6h-pw-FvU" secondAttribute="top" constant="5" id="lPk-ot-k5l"/>
+                <constraint firstItem="f6h-pw-FvU" firstAttribute="top" secondItem="VJM-ib-LUP" secondAttribute="top" constant="-5" id="0pn-Nk-1zK"/>
+                <constraint firstAttribute="bottom" secondItem="VJM-ib-LUP" secondAttribute="bottom" id="5EZ-YP-0he"/>
+                <constraint firstItem="VJM-ib-LUP" firstAttribute="centerX" secondItem="BkF-x3-7fX" secondAttribute="centerX" id="I5C-UZ-BnC"/>
+                <constraint firstItem="VJM-ib-LUP" firstAttribute="top" secondItem="BkF-x3-7fX" secondAttribute="top" constant="11" id="gGL-UL-DHn"/>
+                <constraint firstItem="f6h-pw-FvU" firstAttribute="trailing" secondItem="VJM-ib-LUP" secondAttribute="trailing" constant="-3" id="ilt-qd-gIW"/>
             </constraints>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
-                <outlet property="memberAvatar" destination="7U9-Y6-cEm" id="8PP-8r-xoI"/>
-                <outlet property="memberAvatarCenterXConstraint" destination="C5g-ho-90L" id="ILx-zG-Dbj"/>
+                <outlet property="memberAvatarMask" destination="VJM-ib-LUP" id="cnl-NC-4DH"/>
+                <outlet property="memberAvatarMaskCenterXConstraint" destination="I5C-UZ-BnC" id="rc9-oe-GrK"/>
                 <outlet property="memberBadge" destination="f6h-pw-FvU" id="pDM-O6-238"/>
             </connections>
         </view>