diff --git a/Vector/Assets/en.lproj/Vector.strings b/Vector/Assets/en.lproj/Vector.strings
index e06e03492..35074b194 100644
--- a/Vector/Assets/en.lproj/Vector.strings
+++ b/Vector/Assets/en.lproj/Vector.strings
@@ -72,10 +72,6 @@
 "room_participants_invite_another_user" = "Invite another user";
 
 // Chat
-"room_option_start_group_voice" = "Start group audio chat";
-"room_option_start_group_video" = "Start group video chat";
-"room_option_share_location" = "Share location";
-"room_option_share_contact" = "Share contact";
 "room_one_user_is_typing" = "%@ is typing...";
 "room_two_users_are_typing" = "%@ & %@ are typing...";
 "room_many_users_are_typing" = "%@, %@ & others are typing...";
diff --git a/Vector/Views/RoomActivitiesView/RoomActivitiesView.xib b/Vector/Views/RoomActivitiesView/RoomActivitiesView.xib
index d43cb6cad..b452031fc 100644
--- a/Vector/Views/RoomActivitiesView/RoomActivitiesView.xib
+++ b/Vector/Views/RoomActivitiesView/RoomActivitiesView.xib
@@ -75,6 +75,6 @@
         </view>
     </objects>
     <resources>
-        <image name="typing.png" width="20" height="20"/>
+        <image name="typing.png" width="16" height="15"/>
     </resources>
 </document>
diff --git a/Vector/Views/RoomInputToolbar/RoomInputToolbarView.h b/Vector/Views/RoomInputToolbar/RoomInputToolbarView.h
index 350d62a48..4f76cf83e 100644
--- a/Vector/Views/RoomInputToolbar/RoomInputToolbarView.h
+++ b/Vector/Views/RoomInputToolbar/RoomInputToolbarView.h
@@ -29,17 +29,7 @@
 
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *messageComposerContainerTrailingConstraint;
 
-@property (weak, nonatomic) IBOutlet UIView *optionMenuView;
-@property (weak, nonatomic) IBOutlet UIButton *startVoiceCallButton;
-@property (weak, nonatomic) IBOutlet UILabel *startVoiceCallLabel;
-@property (weak, nonatomic) IBOutlet UIButton *startVideoCallButton;
-@property (weak, nonatomic) IBOutlet UILabel *startVideoCallLabel;
-@property (weak, nonatomic) IBOutlet UIButton *shareLocationButton;
-@property (weak, nonatomic) IBOutlet UILabel *shareLocationLabel;
-@property (weak, nonatomic) IBOutlet UIButton *shareContactButton;
-@property (weak, nonatomic) IBOutlet UILabel *shareContactLabel;
-
 @property (weak, nonatomic) IBOutlet UIButton *attachMediaButton;
-@property (weak, nonatomic) IBOutlet UIButton *optionMenuButton;
+@property (weak, nonatomic) IBOutlet UIButton *voiceCallButton;
 
 @end
diff --git a/Vector/Views/RoomInputToolbar/RoomInputToolbarView.m b/Vector/Views/RoomInputToolbar/RoomInputToolbarView.m
index 5c1b43bce..228791aa6 100644
--- a/Vector/Views/RoomInputToolbar/RoomInputToolbarView.m
+++ b/Vector/Views/RoomInputToolbar/RoomInputToolbarView.m
@@ -54,15 +54,6 @@
     // Remove default toolbar background color
     self.backgroundColor = [UIColor whiteColor];
     
-    self.startVoiceCallLabel.text = NSLocalizedStringFromTable(@"room_option_start_group_voice", @"Vector", nil);
-    self.startVoiceCallLabel.numberOfLines = 0;
-    self.startVideoCallLabel.text = NSLocalizedStringFromTable(@"room_option_start_group_video", @"Vector", nil);
-    self.startVideoCallLabel.numberOfLines = 0;
-    self.shareLocationLabel.text = NSLocalizedStringFromTable(@"room_option_share_location", @"Vector", nil);
-    self.shareLocationLabel.numberOfLines = 0;
-    self.shareContactLabel.text = NSLocalizedStringFromTable(@"room_option_share_contact", @"Vector", nil);
-    self.shareContactLabel.numberOfLines = 0;
-    
     self.rightInputToolbarButton.hidden = YES;
 }
 
@@ -90,13 +81,7 @@
     {
         self.rightInputToolbarButton.hidden = NO;
         self.attachMediaButton.hidden = YES;
-        self.optionMenuButton.hidden = YES;
-        
-        if (self.optionMenuView.isHidden == NO)
-        {
-            // Hide option menu
-            [self onTouchUpInside:self.optionMenuButton];
-        }
+        self.voiceCallButton.hidden = YES;
         
         self.messageComposerContainerTrailingConstraint.constant = self.frame.size.width - self.rightInputToolbarButton.frame.origin.x + 4;
     }
@@ -104,7 +89,7 @@
     {
         self.rightInputToolbarButton.hidden = YES;
         self.attachMediaButton.hidden = NO;
-        self.optionMenuButton.hidden = NO;
+        self.voiceCallButton.hidden = NO;
         
         self.messageComposerContainerTrailingConstraint.constant = self.frame.size.width - self.attachMediaButton.frame.origin.x + 4;
     }
@@ -112,20 +97,16 @@
 
 - (void)growingTextView:(HPGrowingTextView *)growingTextView willChangeHeight:(float)height
 {
+    // FIXME GFO: Check whether mainToolbarHeightConstraint can be removed. If yes, remove it and remove
+    // this overidden method, the original one should be fine.
+    
     // Update height of the main toolbar (message composer)
     self.mainToolbarHeightConstraint.constant = height + (self.messageComposerContainerTopConstraint.constant + self.messageComposerContainerBottomConstraint.constant);
     
-    // Compute height of the whole toolbar (including potential option menu)
-    CGFloat updatedHeight = self.mainToolbarHeightConstraint.constant;
-    if (self.optionMenuView.isHidden == NO)
-    {
-        updatedHeight += self.optionMenuView.frame.size.height;
-    }
-    
     // Update toolbar superview
     if ([self.delegate respondsToSelector:@selector(roomInputToolbarView:heightDidChanged:completion:)])
     {
-        [self.delegate roomInputToolbarView:self heightDidChanged:updatedHeight completion:nil];
+        [self.delegate roomInputToolbarView:self heightDidChanged:self.mainToolbarHeightConstraint.constant completion:nil];
     }
 }
 
@@ -164,66 +145,12 @@
             NSLog(@"[RoomInputToolbarView] Attach media is not supported");
         }
     }
-    else if (button == self.optionMenuButton)
-    {
-        // Compute the height of the whole toolbar (message composer + option menu (if any))
-        CGFloat updatedHeight = self.mainToolbarHeightConstraint.constant;
-        BOOL hideOptionMenuView = !self.optionMenuView.isHidden;
-        
-        if (self.optionMenuView.isHidden)
-        {
-            // The option menu will appear
-            updatedHeight += self.optionMenuView.frame.size.height;
-            self.optionMenuView.hidden = NO;
-        }
-        
-        // Update toolbar superview
-        if ([self.delegate respondsToSelector:@selector(roomInputToolbarView:heightDidChanged:completion:)])
-        {
-            [self.delegate roomInputToolbarView:self heightDidChanged:updatedHeight completion:^(BOOL finished) {
-                if (hideOptionMenuView)
-                {
-                    self.optionMenuView.hidden = YES;
-                }
-            }];
-        }
-        
-        // Refresh max height of the growning text
-        self.maxHeight = self.maxHeight;
-    }
-    else if (button == self.startVoiceCallButton)
+    else if (button == self.voiceCallButton)
     {
         if ([self.delegate respondsToSelector:@selector(roomInputToolbarView:placeCallWithVideo:)])
         {
             [self.delegate roomInputToolbarView:self placeCallWithVideo:NO];
         }
-        
-        // Hide option menu
-        [self onTouchUpInside:self.optionMenuButton];
-    }
-    else if (button == self.startVideoCallButton)
-    {
-        if ([self.delegate respondsToSelector:@selector(roomInputToolbarView:placeCallWithVideo:)])
-        {
-            [self.delegate roomInputToolbarView:self placeCallWithVideo:YES];
-        }
-        
-        // Hide option menu
-        [self onTouchUpInside:self.optionMenuButton];
-    }
-    else if (button == self.shareLocationButton)
-    {
-        // TODO
-        
-        // Hide option menu
-        [self onTouchUpInside:self.optionMenuButton];
-    }
-    else if (button == self.shareContactButton)
-    {
-        // TODO
-        
-        // Hide option menu
-        [self onTouchUpInside:self.optionMenuButton];
     }
     
     [super onTouchUpInside:button];
diff --git a/Vector/Views/RoomInputToolbar/RoomInputToolbarView.xib b/Vector/Views/RoomInputToolbar/RoomInputToolbarView.xib
index 621f44ee4..4dca876d5 100644
--- a/Vector/Views/RoomInputToolbar/RoomInputToolbarView.xib
+++ b/Vector/Views/RoomInputToolbar/RoomInputToolbarView.xib
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D131" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9059" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -13,183 +12,13 @@
             <rect key="frame" x="0.0" y="0.0" width="600" height="50"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eSL-yA-AVi" userLabel="Option Menu View">
-                    <rect key="frame" x="0.0" y="0.0" width="600" height="80"/>
-                    <subviews>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kUX-bM-pqB" userLabel="Separator View">
-                            <rect key="frame" x="0.0" y="0.0" width="600" height="2"/>
-                            <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="2" id="wn1-2b-seV"/>
-                            </constraints>
-                        </view>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oTG-WT-raO" userLabel="voiceCallButtonView">
-                            <rect key="frame" x="8" y="3" width="284" height="36"/>
-                            <subviews>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Jel-mh-ONW" userLabel="startVoiceCallButton">
-                                    <rect key="frame" x="0.0" y="0.0" width="284" height="36"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                    <state key="normal" image="voice_call.png">
-                                        <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                    </state>
-                                    <state key="highlighted" image="voice_call.png"/>
-                                    <connections>
-                                        <action selector="onTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="pAx-jp-BGW"/>
-                                    </connections>
-                                </button>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Start audio chat" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nG8-kL-koL">
-                                    <rect key="frame" x="41" y="0.0" width="243" height="36"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
-                            </subviews>
-                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                            <constraints>
-                                <constraint firstItem="Jel-mh-ONW" firstAttribute="leading" secondItem="oTG-WT-raO" secondAttribute="leading" id="8zC-Wy-xYQ"/>
-                                <constraint firstItem="Jel-mh-ONW" firstAttribute="top" secondItem="oTG-WT-raO" secondAttribute="top" id="91c-MR-EIL"/>
-                                <constraint firstAttribute="trailing" secondItem="nG8-kL-koL" secondAttribute="trailing" id="Etl-Vp-Y5B"/>
-                                <constraint firstItem="nG8-kL-koL" firstAttribute="top" secondItem="oTG-WT-raO" secondAttribute="top" id="RGV-dk-cCT"/>
-                                <constraint firstItem="nG8-kL-koL" firstAttribute="leading" secondItem="oTG-WT-raO" secondAttribute="leading" constant="41" id="S8b-fK-4HB"/>
-                                <constraint firstAttribute="bottom" secondItem="nG8-kL-koL" secondAttribute="bottom" id="ewl-0V-cYl"/>
-                                <constraint firstAttribute="trailing" secondItem="Jel-mh-ONW" secondAttribute="trailing" id="jCe-Rv-O7D"/>
-                                <constraint firstAttribute="bottom" secondItem="Jel-mh-ONW" secondAttribute="bottom" id="kvO-gk-V21"/>
-                            </constraints>
-                        </view>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FTt-lj-eOg" userLabel="videoCallButtonView">
-                            <rect key="frame" x="308" y="3" width="284" height="36"/>
-                            <subviews>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hn0-fF-IAm" userLabel="startVideoCallButton">
-                                    <rect key="frame" x="0.0" y="0.0" width="284" height="36"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                    <state key="normal" image="video_call.png">
-                                        <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                    </state>
-                                    <state key="highlighted" image="video_call.png"/>
-                                    <connections>
-                                        <action selector="onTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="upn-cj-hqK"/>
-                                    </connections>
-                                </button>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Start video chat" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qhv-aK-hmK">
-                                    <rect key="frame" x="41" y="0.0" width="243" height="36"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
-                            </subviews>
-                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                            <constraints>
-                                <constraint firstAttribute="bottom" secondItem="hn0-fF-IAm" secondAttribute="bottom" id="4Hs-fM-xnf"/>
-                                <constraint firstAttribute="trailing" secondItem="hn0-fF-IAm" secondAttribute="trailing" id="AqD-vS-919"/>
-                                <constraint firstAttribute="trailing" secondItem="Qhv-aK-hmK" secondAttribute="trailing" id="R2N-fR-hOy"/>
-                                <constraint firstItem="hn0-fF-IAm" firstAttribute="leading" secondItem="FTt-lj-eOg" secondAttribute="leading" id="TPk-bq-AFF"/>
-                                <constraint firstItem="hn0-fF-IAm" firstAttribute="top" secondItem="FTt-lj-eOg" secondAttribute="top" id="W2T-Hy-JQC"/>
-                                <constraint firstItem="Qhv-aK-hmK" firstAttribute="leading" secondItem="FTt-lj-eOg" secondAttribute="leading" constant="41" id="hba-ty-S4P"/>
-                                <constraint firstItem="Qhv-aK-hmK" firstAttribute="top" secondItem="FTt-lj-eOg" secondAttribute="top" id="k76-by-bb1"/>
-                                <constraint firstAttribute="bottom" secondItem="Qhv-aK-hmK" secondAttribute="bottom" id="oQq-mQ-OgW"/>
-                            </constraints>
-                        </view>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="87t-6b-zMl" userLabel="shareLocationButtonView">
-                            <rect key="frame" x="8" y="42" width="284" height="36"/>
-                            <subviews>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zr8-63-d18" userLabel="shareLocationButton">
-                                    <rect key="frame" x="0.0" y="0.0" width="284" height="36"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                    <state key="normal" image="share_location.png">
-                                        <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                    </state>
-                                    <state key="highlighted" image="share_location.png"/>
-                                    <connections>
-                                        <action selector="onTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="5z4-cX-lIl"/>
-                                    </connections>
-                                </button>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Share location" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Id3-nH-7Y6">
-                                    <rect key="frame" x="41" y="0.0" width="243" height="36"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
-                            </subviews>
-                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                            <constraints>
-                                <constraint firstAttribute="trailing" secondItem="Id3-nH-7Y6" secondAttribute="trailing" id="50N-sw-KNW"/>
-                                <constraint firstItem="Id3-nH-7Y6" firstAttribute="top" secondItem="87t-6b-zMl" secondAttribute="top" id="6Zq-5H-VSd"/>
-                                <constraint firstAttribute="bottom" secondItem="Id3-nH-7Y6" secondAttribute="bottom" id="7M8-3w-dK8"/>
-                                <constraint firstAttribute="bottom" secondItem="Zr8-63-d18" secondAttribute="bottom" id="FqR-cY-Dg9"/>
-                                <constraint firstItem="Zr8-63-d18" firstAttribute="top" secondItem="87t-6b-zMl" secondAttribute="top" id="MKv-4N-bUK"/>
-                                <constraint firstAttribute="trailing" secondItem="Zr8-63-d18" secondAttribute="trailing" id="RjZ-Kh-z3F"/>
-                                <constraint firstItem="Id3-nH-7Y6" firstAttribute="leading" secondItem="87t-6b-zMl" secondAttribute="leading" constant="41" id="hSv-RN-V6O"/>
-                                <constraint firstItem="Zr8-63-d18" firstAttribute="leading" secondItem="87t-6b-zMl" secondAttribute="leading" id="p3v-IC-fZ9"/>
-                            </constraints>
-                        </view>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rZn-dW-pQG" userLabel="shareContactButtonView">
-                            <rect key="frame" x="308" y="42" width="284" height="36"/>
-                            <subviews>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pc9-aU-j6t" userLabel="shareContactButton">
-                                    <rect key="frame" x="0.0" y="0.0" width="284" height="36"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                    <state key="normal" image="share_contact.png">
-                                        <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                    </state>
-                                    <state key="highlighted" image="share_contact.png"/>
-                                    <connections>
-                                        <action selector="onTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="Nnw-rl-jDT"/>
-                                    </connections>
-                                </button>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Share contact" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2FA-SF-a80">
-                                    <rect key="frame" x="41" y="0.0" width="243" height="36"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
-                            </subviews>
-                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                            <constraints>
-                                <constraint firstItem="pc9-aU-j6t" firstAttribute="leading" secondItem="rZn-dW-pQG" secondAttribute="leading" id="2uW-o8-UZd"/>
-                                <constraint firstAttribute="bottom" secondItem="2FA-SF-a80" secondAttribute="bottom" id="3Lz-qx-SAz"/>
-                                <constraint firstItem="2FA-SF-a80" firstAttribute="leading" secondItem="rZn-dW-pQG" secondAttribute="leading" constant="41" id="ICA-4w-IfL"/>
-                                <constraint firstItem="pc9-aU-j6t" firstAttribute="top" secondItem="rZn-dW-pQG" secondAttribute="top" id="SLz-qm-7LX"/>
-                                <constraint firstAttribute="bottom" secondItem="pc9-aU-j6t" secondAttribute="bottom" id="TIO-uL-Ooe"/>
-                                <constraint firstItem="2FA-SF-a80" firstAttribute="top" secondItem="rZn-dW-pQG" secondAttribute="top" id="qGx-6K-wAm"/>
-                                <constraint firstAttribute="trailing" secondItem="pc9-aU-j6t" secondAttribute="trailing" id="uf1-FC-mGM"/>
-                                <constraint firstAttribute="trailing" secondItem="2FA-SF-a80" secondAttribute="trailing" id="ySq-j0-Sdv"/>
-                            </constraints>
-                        </view>
-                    </subviews>
-                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                    <constraints>
-                        <constraint firstItem="oTG-WT-raO" firstAttribute="height" secondItem="eSL-yA-AVi" secondAttribute="height" multiplier="0.5" constant="-4" id="0X9-WJ-kUY"/>
-                        <constraint firstItem="FTt-lj-eOg" firstAttribute="top" secondItem="kUX-bM-pqB" secondAttribute="bottom" constant="1" id="1nt-a9-a1W"/>
-                        <constraint firstAttribute="bottom" secondItem="87t-6b-zMl" secondAttribute="bottom" constant="2" id="5VF-mi-mwE"/>
-                        <constraint firstItem="oTG-WT-raO" firstAttribute="leading" secondItem="eSL-yA-AVi" secondAttribute="leading" constant="8" id="6SO-bV-UoM"/>
-                        <constraint firstItem="kUX-bM-pqB" firstAttribute="leading" secondItem="eSL-yA-AVi" secondAttribute="leading" id="8ey-wV-Xha"/>
-                        <constraint firstItem="rZn-dW-pQG" firstAttribute="leading" secondItem="87t-6b-zMl" secondAttribute="trailing" constant="16" id="BmX-fQ-MKm"/>
-                        <constraint firstAttribute="bottom" secondItem="rZn-dW-pQG" secondAttribute="bottom" constant="2" id="Bvq-tC-ExY"/>
-                        <constraint firstItem="kUX-bM-pqB" firstAttribute="top" secondItem="eSL-yA-AVi" secondAttribute="top" id="Jpo-MZ-Q2I"/>
-                        <constraint firstAttribute="height" constant="80" id="OOi-IP-o2p"/>
-                        <constraint firstItem="87t-6b-zMl" firstAttribute="width" secondItem="oTG-WT-raO" secondAttribute="width" id="VMG-yY-TPX"/>
-                        <constraint firstItem="87t-6b-zMl" firstAttribute="leading" secondItem="eSL-yA-AVi" secondAttribute="leading" constant="8" id="ZgE-Kp-XLI"/>
-                        <constraint firstAttribute="trailing" secondItem="kUX-bM-pqB" secondAttribute="trailing" id="ZxZ-dq-7Hb"/>
-                        <constraint firstItem="FTt-lj-eOg" firstAttribute="height" secondItem="oTG-WT-raO" secondAttribute="height" id="c9m-Nz-h82"/>
-                        <constraint firstItem="FTt-lj-eOg" firstAttribute="width" secondItem="oTG-WT-raO" secondAttribute="width" id="h3z-AU-wc3"/>
-                        <constraint firstItem="oTG-WT-raO" firstAttribute="height" secondItem="rZn-dW-pQG" secondAttribute="height" id="ihY-Wq-sAK"/>
-                        <constraint firstItem="oTG-WT-raO" firstAttribute="width" secondItem="rZn-dW-pQG" secondAttribute="width" id="jOl-Gz-C0M"/>
-                        <constraint firstItem="FTt-lj-eOg" firstAttribute="leading" secondItem="oTG-WT-raO" secondAttribute="trailing" constant="16" id="l2p-6O-vTy"/>
-                        <constraint firstItem="oTG-WT-raO" firstAttribute="width" secondItem="eSL-yA-AVi" secondAttribute="width" multiplier="0.5" constant="-16" id="oMN-Sy-xl5"/>
-                        <constraint firstItem="87t-6b-zMl" firstAttribute="height" secondItem="oTG-WT-raO" secondAttribute="height" id="txk-s3-F00"/>
-                        <constraint firstItem="oTG-WT-raO" firstAttribute="top" secondItem="kUX-bM-pqB" secondAttribute="bottom" constant="1" id="wwB-43-X0z"/>
-                    </constraints>
-                </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a84-Vc-6ud" userLabel="MainToolBar View">
                     <rect key="frame" x="0.0" y="0.0" width="600" height="50"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3ln-yI-ef9" userLabel="Separator View">
                             <rect key="frame" x="0.0" y="1" width="600" height="2"/>
-                            <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                            <animations/>
+                            <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="2" id="WBM-ts-zPX"/>
                             </constraints>
@@ -199,9 +28,11 @@
                             <subviews>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wgb-ON-N29" customClass="HPGrowingTextView">
                                     <rect key="frame" x="0.0" y="0.0" width="501" height="33"/>
+                                    <animations/>
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 </view>
                             </subviews>
+                            <animations/>
                             <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
                             <constraints>
                                 <constraint firstItem="wgb-ON-N29" firstAttribute="top" secondItem="QWp-NV-uh5" secondAttribute="top" id="0jt-Ye-2DW"/>
@@ -212,6 +43,7 @@
                         </view>
                         <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="G8Z-CM-tGs" userLabel="send Button">
                             <rect key="frame" x="552" y="3" width="44" height="47"/>
+                            <animations/>
                             <constraints>
                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="44" id="KnT-92-5v2"/>
                                 <constraint firstAttribute="width" constant="44" id="Moy-iD-5A4"/>
@@ -223,30 +55,33 @@
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hga-l8-Wua" userLabel="attach Button">
                             <rect key="frame" x="513" y="5" width="41" height="41"/>
+                            <animations/>
                             <constraints>
                                 <constraint firstAttribute="width" secondItem="Hga-l8-Wua" secondAttribute="height" multiplier="1:1" id="f0T-3f-BJu"/>
                             </constraints>
-                            <state key="normal" image="attach_media.png"/>
-                            <state key="highlighted" image="attach_media.png"/>
+                            <state key="normal" image="upload_icon.png"/>
+                            <state key="highlighted" image="upload_icon.png"/>
                             <connections>
                                 <action selector="onTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="WbU-WH-gwL"/>
                             </connections>
                         </button>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Owf-M8-qJi" userLabel="menu Button">
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Owf-M8-qJi" userLabel="voice call Button">
                             <rect key="frame" x="555" y="5" width="41" height="41"/>
+                            <animations/>
                             <constraints>
                                 <constraint firstAttribute="width" secondItem="Owf-M8-qJi" secondAttribute="height" multiplier="1:1" id="1Ni-y7-Nsa"/>
                                 <constraint firstAttribute="width" constant="41" id="9FZ-CI-diT"/>
                             </constraints>
-                            <state key="normal" image="send_other.png">
+                            <state key="normal" image="voice_call_icon.png">
                                 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                             </state>
-                            <state key="highlighted" image="send_other.png"/>
+                            <state key="highlighted" image="voice_call_icon.png"/>
                             <connections>
                                 <action selector="onTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="Cxg-BO-TfK"/>
                             </connections>
                         </button>
                     </subviews>
+                    <animations/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="50" id="1FO-iu-urG"/>
@@ -273,13 +108,11 @@
                     </constraints>
                 </view>
             </subviews>
+            <animations/>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="eSL-yA-AVi" secondAttribute="trailing" id="E9Z-qG-wCp"/>
-                <constraint firstItem="eSL-yA-AVi" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Lhf-VQ-nmh"/>
                 <constraint firstItem="a84-Vc-6ud" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="VBS-kE-WiP"/>
                 <constraint firstAttribute="trailing" secondItem="a84-Vc-6ud" secondAttribute="trailing" id="cNb-nJ-iAI"/>
-                <constraint firstItem="eSL-yA-AVi" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="ceD-4c-5tS"/>
                 <constraint firstAttribute="bottom" secondItem="a84-Vc-6ud" secondAttribute="bottom" id="jFc-lW-hpZ"/>
             </constraints>
             <nil key="simulatedStatusBarMetrics"/>
@@ -295,26 +128,13 @@
                 <outlet property="messageComposerContainerBottomConstraint" destination="ofY-ge-kII" id="FoQ-4Q-KRd"/>
                 <outlet property="messageComposerContainerTopConstraint" destination="WyZ-3i-OHi" id="OcO-1f-bNA"/>
                 <outlet property="messageComposerContainerTrailingConstraint" destination="hXO-cY-Jgz" id="lHZ-MU-vyC"/>
-                <outlet property="optionMenuButton" destination="Owf-M8-qJi" id="fCV-Ky-xSN"/>
-                <outlet property="optionMenuView" destination="eSL-yA-AVi" id="70Q-8x-A57"/>
                 <outlet property="rightInputToolbarButton" destination="G8Z-CM-tGs" id="NCk-5m-aNF"/>
-                <outlet property="shareContactButton" destination="pc9-aU-j6t" id="tuS-fr-cFs"/>
-                <outlet property="shareContactLabel" destination="2FA-SF-a80" id="6js-hS-zJu"/>
-                <outlet property="shareLocationButton" destination="Zr8-63-d18" id="Fn3-mt-MOz"/>
-                <outlet property="shareLocationLabel" destination="Id3-nH-7Y6" id="6Ve-3R-dvQ"/>
-                <outlet property="startVideoCallButton" destination="hn0-fF-IAm" id="exH-u8-1sw"/>
-                <outlet property="startVideoCallLabel" destination="Qhv-aK-hmK" id="h1O-wO-l9e"/>
-                <outlet property="startVoiceCallButton" destination="Jel-mh-ONW" id="Sfu-Ef-sWI"/>
-                <outlet property="startVoiceCallLabel" destination="nG8-kL-koL" id="s8I-kj-ZOp"/>
+                <outlet property="voiceCallButton" destination="Owf-M8-qJi" id="krT-w1-mfT"/>
             </connections>
         </view>
     </objects>
     <resources>
-        <image name="attach_media.png" width="31" height="31"/>
-        <image name="send_other.png" width="31" height="31"/>
-        <image name="share_contact.png" width="31" height="31"/>
-        <image name="share_location.png" width="31" height="31"/>
-        <image name="video_call.png" width="31" height="31"/>
-        <image name="voice_call.png" width="31" height="31"/>
+        <image name="upload_icon.png" width="11" height="13"/>
+        <image name="voice_call_icon.png" width="12" height="14"/>
     </resources>
 </document>