diff --git a/Vector/ViewController/RoomSettingsViewController.m b/Vector/ViewController/RoomSettingsViewController.m
index 8f612ea10..adfa284aa 100644
--- a/Vector/ViewController/RoomSettingsViewController.m
+++ b/Vector/ViewController/RoomSettingsViewController.m
@@ -632,7 +632,7 @@
             
             // disable the edition if the user cannoy update it
             roomTopicCell.mxkTextView.editable = mxRoom.isModerator;
-            roomTopicCell.mxkTextView.textColor = mxRoom.isModerator ? [UIColor blackColor] : [UIColor lightGrayColor];
+            roomTopicCell.mxkTextView.textColor = VECTOR_TEXT_GRAY_COLOR;
             
             cell = roomTopicCell;
         }
@@ -664,7 +664,7 @@
             
             // disable the edition if the user cannoy update it
             roomNameCell.editable = mxRoom.isModerator;
-            roomNameCell.mxkTextField.textColor = mxRoom.isModerator ? [UIColor blackColor] : [UIColor lightGrayColor];
+            roomNameCell.mxkTextField.textColor = VECTOR_TEXT_GRAY_COLOR;
             
             
             // Add a "textFieldDidChange" notification method to the text field control.
diff --git a/Vector/Views/TableViewCell/TableViewCellWithLabelAndLargeTextView.xib b/Vector/Views/TableViewCell/TableViewCellWithLabelAndLargeTextView.xib
index 2aa0f1aca..d73f5a174 100644
--- a/Vector/Views/TableViewCell/TableViewCellWithLabelAndLargeTextView.xib
+++ b/Vector/Views/TableViewCell/TableViewCellWithLabelAndLargeTextView.xib
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="99" id="5Je-1y-foH" customClass="TableViewCellWithLabelAndLargeTextView">
-            <rect key="frame" x="0.0" y="0.0" width="600" height="99"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="124" id="5Je-1y-foH" customClass="TableViewCellWithLabelAndLargeTextView">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="124"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5Je-1y-foH" id="hCm-wd-Yup">
-                <rect key="frame" x="0.0" y="0.0" width="600" height="98"/>
+                <rect key="frame" x="0.0" y="0.0" width="600" height="123"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="justified" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="584" translatesAutoresizingMaskIntoConstraints="NO" id="DE7-uC-Oz2">
-                        <rect key="frame" x="10" y="8" width="45" height="21"/>
+                        <rect key="frame" x="15" y="12" width="42" height="21"/>
                         <color key="tintColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                        <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="a text" textAlignment="right" translatesAutoresizingMaskIntoConstraints="NO" id="6xh-yB-9FP" userLabel="Mxk TextView">
-                        <rect key="frame" x="63" y="0.0" width="529" height="91"/>
+                        <rect key="frame" x="65" y="6" width="525" height="110"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                     </textView>
                 </subviews>
                 <constraints>
                     <constraint firstItem="6xh-yB-9FP" firstAttribute="leading" secondItem="DE7-uC-Oz2" secondAttribute="trailing" constant="8" id="1S8-WD-YdX"/>
-                    <constraint firstItem="DE7-uC-Oz2" firstAttribute="leading" secondItem="hCm-wd-Yup" secondAttribute="leading" constant="10" id="qse-r7-x6e"/>
+                    <constraint firstItem="DE7-uC-Oz2" firstAttribute="leading" secondItem="hCm-wd-Yup" secondAttribute="leading" constant="15" id="qse-r7-x6e"/>
                 </constraints>
             </tableViewCellContentView>
             <constraints>
-                <constraint firstItem="DE7-uC-Oz2" firstAttribute="top" secondItem="5Je-1y-foH" secondAttribute="top" constant="8" id="4gW-jW-XUX"/>
+                <constraint firstItem="DE7-uC-Oz2" firstAttribute="top" secondItem="5Je-1y-foH" secondAttribute="top" constant="12" id="4gW-jW-XUX"/>
                 <constraint firstAttribute="bottom" secondItem="6xh-yB-9FP" secondAttribute="bottom" constant="8" id="Io9-HP-DJE"/>
-                <constraint firstItem="6xh-yB-9FP" firstAttribute="top" secondItem="5Je-1y-foH" secondAttribute="top" id="PqJ-jG-FUv"/>
-                <constraint firstAttribute="trailing" secondItem="6xh-yB-9FP" secondAttribute="trailing" constant="8" id="hIh-cS-5Lj"/>
+                <constraint firstItem="6xh-yB-9FP" firstAttribute="top" secondItem="5Je-1y-foH" secondAttribute="top" constant="6" id="PqJ-jG-FUv"/>
+                <constraint firstAttribute="trailing" secondItem="6xh-yB-9FP" secondAttribute="trailing" constant="10" id="hIh-cS-5Lj"/>
             </constraints>
             <connections>
                 <outlet property="mxkLabel" destination="DE7-uC-Oz2" id="944-Ob-lSz"/>
diff --git a/Vector/Views/TableViewCell/TableViewCellWithLabelAndMXKImageView.xib b/Vector/Views/TableViewCell/TableViewCellWithLabelAndMXKImageView.xib
index c48d3366e..693819ba0 100644
--- a/Vector/Views/TableViewCell/TableViewCellWithLabelAndMXKImageView.xib
+++ b/Vector/Views/TableViewCell/TableViewCellWithLabelAndMXKImageView.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -15,32 +15,28 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xx4-AP-OQs">
-                        <rect key="frame" x="10" y="11" width="544" height="21"/>
-                        <animations/>
-                        <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                        <rect key="frame" x="15" y="11" width="539" height="21"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Ts-eR-MZV" userLabel="Mxk ImageView" customClass="MXKImageView">
-                        <rect key="frame" x="560" y="5" width="34" height="34"/>
-                        <animations/>
+                        <rect key="frame" x="560" y="7" width="30" height="30"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="34" id="Ejk-bJ-0MB"/>
-                            <constraint firstAttribute="height" constant="34" id="m9S-XK-OTa"/>
+                            <constraint firstAttribute="width" constant="30" id="Ejk-bJ-0MB"/>
+                            <constraint firstAttribute="height" constant="30" id="m9S-XK-OTa"/>
                         </constraints>
                     </view>
                 </subviews>
-                <animations/>
                 <constraints>
-                    <constraint firstItem="Xx4-AP-OQs" firstAttribute="leading" secondItem="Eg5-vl-rni" secondAttribute="leading" constant="10" id="Wih-ke-1dd"/>
+                    <constraint firstItem="Xx4-AP-OQs" firstAttribute="leading" secondItem="Eg5-vl-rni" secondAttribute="leading" constant="15" id="Wih-ke-1dd"/>
                     <constraint firstItem="7Ts-eR-MZV" firstAttribute="leading" secondItem="Xx4-AP-OQs" secondAttribute="trailing" constant="6" id="fSB-ec-jkJ"/>
                     <constraint firstAttribute="centerY" secondItem="Xx4-AP-OQs" secondAttribute="centerY" id="v6O-QC-moW"/>
                 </constraints>
             </tableViewCellContentView>
-            <animations/>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="7Ts-eR-MZV" secondAttribute="trailing" constant="6" id="JNP-da-JzI"/>
+                <constraint firstAttribute="trailing" secondItem="7Ts-eR-MZV" secondAttribute="trailing" constant="10" id="JNP-da-JzI"/>
                 <constraint firstItem="7Ts-eR-MZV" firstAttribute="centerY" secondItem="aCf-VI-ocb" secondAttribute="centerY" id="lgB-TU-fX3"/>
             </constraints>
             <connections>
diff --git a/Vector/Views/TableViewCell/TableViewCellWithLabelAndSwitch.xib b/Vector/Views/TableViewCell/TableViewCellWithLabelAndSwitch.xib
index 28ff98c98..46c19288e 100644
--- a/Vector/Views/TableViewCell/TableViewCellWithLabelAndSwitch.xib
+++ b/Vector/Views/TableViewCell/TableViewCellWithLabelAndSwitch.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -15,29 +15,25 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9dA-E8-w3v">
-                        <rect key="frame" x="543" y="6" width="51" height="31"/>
-                        <animations/>
+                        <rect key="frame" x="536" y="6" width="51" height="31"/>
                     </switch>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xx4-AP-OQs">
-                        <rect key="frame" x="8" y="11" width="527" height="21"/>
-                        <animations/>
-                        <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                        <rect key="frame" x="15" y="12" width="513" height="19"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                 </subviews>
-                <animations/>
                 <constraints>
-                    <constraint firstAttribute="bottom" secondItem="Xx4-AP-OQs" secondAttribute="bottom" constant="11" id="2wi-Xu-jlr"/>
+                    <constraint firstAttribute="bottom" secondItem="Xx4-AP-OQs" secondAttribute="bottom" constant="12" id="2wi-Xu-jlr"/>
                     <constraint firstItem="9dA-E8-w3v" firstAttribute="top" secondItem="Eg5-vl-rni" secondAttribute="top" constant="6" id="7fZ-Vc-PCU"/>
-                    <constraint firstItem="Xx4-AP-OQs" firstAttribute="top" secondItem="Eg5-vl-rni" secondAttribute="top" constant="11" id="WhC-iv-1UK"/>
-                    <constraint firstItem="Xx4-AP-OQs" firstAttribute="leading" secondItem="Eg5-vl-rni" secondAttribute="leading" constant="8" id="Wih-ke-1dd"/>
+                    <constraint firstItem="Xx4-AP-OQs" firstAttribute="top" secondItem="Eg5-vl-rni" secondAttribute="top" constant="12" id="WhC-iv-1UK"/>
+                    <constraint firstItem="Xx4-AP-OQs" firstAttribute="leading" secondItem="Eg5-vl-rni" secondAttribute="leading" constant="15" id="Wih-ke-1dd"/>
                     <constraint firstAttribute="bottom" secondItem="9dA-E8-w3v" secondAttribute="bottom" constant="6" id="efV-Gs-ip0"/>
                     <constraint firstItem="9dA-E8-w3v" firstAttribute="leading" secondItem="Xx4-AP-OQs" secondAttribute="trailing" constant="8" id="hms-8a-BYd"/>
-                    <constraint firstAttribute="trailing" secondItem="9dA-E8-w3v" secondAttribute="trailing" constant="8" id="oN3-Ph-hS5"/>
+                    <constraint firstAttribute="trailing" secondItem="9dA-E8-w3v" secondAttribute="trailing" constant="15" id="oN3-Ph-hS5"/>
                 </constraints>
             </tableViewCellContentView>
-            <animations/>
             <connections>
                 <outlet property="mxkLabel" destination="Xx4-AP-OQs" id="jTM-zE-gtP"/>
                 <outlet property="mxkSwitch" destination="9dA-E8-w3v" id="sko-Dh-EsF"/>
diff --git a/Vector/Views/TableViewCell/TableViewCellWithLabelAndTextField.xib b/Vector/Views/TableViewCell/TableViewCellWithLabelAndTextField.xib
index f8a90cf7f..31c2225f6 100644
--- a/Vector/Views/TableViewCell/TableViewCellWithLabelAndTextField.xib
+++ b/Vector/Views/TableViewCell/TableViewCellWithLabelAndTextField.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -14,7 +14,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="A text here" textAlignment="right" minimumFontSize="14" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="SBE-PS-i6p">
+                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="A text here" textAlignment="right" minimumFontSize="14" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="SBE-PS-i6p">
                         <rect key="frame" x="63" y="12" width="527" height="21"/>
                         <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -23,20 +23,20 @@
                             <outlet property="delegate" destination="5Je-1y-foH" id="Nie-b5-gB9"/>
                         </connections>
                     </textField>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="justified" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="584" translatesAutoresizingMaskIntoConstraints="NO" id="DE7-uC-Oz2">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Label" textAlignment="justified" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="584" translatesAutoresizingMaskIntoConstraints="NO" id="DE7-uC-Oz2">
                         <rect key="frame" x="10" y="11" width="45" height="21"/>
                         <color key="tintColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                        <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                 </subviews>
                 <constraints>
-                    <constraint firstAttribute="trailing" secondItem="SBE-PS-i6p" secondAttribute="trailing" constant="10" id="7NM-6p-4fc"/>
+                    <constraint firstAttribute="trailing" secondItem="SBE-PS-i6p" secondAttribute="trailing" constant="15" id="7NM-6p-4fc"/>
                     <constraint firstItem="SBE-PS-i6p" firstAttribute="centerY" secondItem="DE7-uC-Oz2" secondAttribute="centerY" constant="0.5" id="LEG-PI-Zmz"/>
                     <constraint firstAttribute="centerY" secondItem="DE7-uC-Oz2" secondAttribute="centerY" id="PU3-ZA-23J"/>
                     <constraint firstItem="SBE-PS-i6p" firstAttribute="leading" secondItem="DE7-uC-Oz2" secondAttribute="trailing" constant="8" id="h1v-HS-kzp"/>
-                    <constraint firstItem="DE7-uC-Oz2" firstAttribute="leading" secondItem="hCm-wd-Yup" secondAttribute="leading" constant="10" id="qse-r7-x6e"/>
+                    <constraint firstItem="DE7-uC-Oz2" firstAttribute="leading" secondItem="hCm-wd-Yup" secondAttribute="leading" constant="15" id="qse-r7-x6e"/>
                 </constraints>
             </tableViewCellContentView>
             <connections>