diff --git a/Classes/Base.lproj/CallIncomingView.xib b/Classes/Base.lproj/CallIncomingView.xib
index 7545138a7..9adc96b5e 100644
--- a/Classes/Base.lproj/CallIncomingView.xib
+++ b/Classes/Base.lproj/CallIncomingView.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F1021" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
@@ -11,6 +11,8 @@
                 <outlet property="avatarImage" destination="19" id="20"/>
                 <outlet property="nameLabel" destination="hjQ-4P-bKP" id="Elh-o8-zM9"/>
                 <outlet property="portraitView" destination="25" id="32"/>
+                <outlet property="tabBar" destination="4" id="9gd-FT-jaI"/>
+                <outlet property="tabVideoBar" destination="vIQ-QP-ooa" id="JZq-9l-pOy"/>
                 <outlet property="view" destination="25" id="26"/>
             </connections>
         </placeholder>
@@ -33,7 +35,7 @@
                             </state>
                         </button>
                         <imageView userInteractionEnabled="NO" tag="7" contentMode="scaleAspectFit" image="avatar.png" id="19" userLabel="avatarImage" customClass="UIRoundedImageView">
-                            <rect key="frame" x="46" y="58" width="283" height="283"/>
+                            <rect key="frame" x="46" y="130" width="283" height="283"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <accessibility key="accessibilityConfiguration" label="Contact avatar">
                                 <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
@@ -41,14 +43,14 @@
                             </accessibility>
                         </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="John Doe" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="19" id="hjQ-4P-bKP" userLabel="nameLabel">
-                            <rect key="frame" x="46" y="359" width="283" height="32"/>
+                            <rect key="frame" x="46" y="50" width="283" height="32"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="37"/>
                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="john.doe@sip.linphone.org" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="8" id="78f-eb-xdx" userLabel="addressLabel">
-                            <rect key="frame" x="90" y="399" width="194" height="22"/>
+                            <rect key="frame" x="90" y="82" width="194" height="40"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" red="1" green="0.36862745099999999" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -89,6 +91,56 @@
                             </subviews>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         </view>
+                        <view hidden="YES" tag="10" contentMode="scaleToFill" id="vIQ-QP-ooa" userLabel="tabVideoBar">
+                            <rect key="frame" x="0.0" y="562" width="375" height="63"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                            <subviews>
+                                <button opaque="NO" tag="12" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="KnH-hj-g47" userLabel="declineButton">
+                                    <rect key="frame" x="1" y="0.0" width="124" height="63"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/>
+                                    <accessibility key="accessibilityConfiguration" label="Decline"/>
+                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                    <state key="normal" image="call_hangup_default.png" backgroundImage="color_D.png">
+                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    </state>
+                                    <state key="disabled" image="call_hangup_disabled.png"/>
+                                    <state key="highlighted" backgroundImage="color_I.png"/>
+                                    <connections>
+                                        <action selector="onDeclineClick:" destination="-1" eventType="touchUpInside" id="Nrs-UR-Hb9"/>
+                                    </connections>
+                                </button>
+                                <button opaque="NO" tag="11" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="tX0-eE-di5" userLabel="acceptButton">
+                                    <rect key="frame" x="250" y="0.0" width="125" height="63"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
+                                    <accessibility key="accessibilityConfiguration" label="Accept"/>
+                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                    <state key="normal" image="call_video_start_default.png" backgroundImage="color_A.png">
+                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    </state>
+                                    <state key="disabled" image="call_video_start_disabled.png"/>
+                                    <state key="selected" image="call_video_start_disabled.png"/>
+                                    <state key="highlighted" backgroundImage="color_L.png"/>
+                                    <connections>
+                                        <action selector="onAcceptClick:" destination="-1" eventType="touchUpInside" id="XvK-9T-J2j"/>
+                                    </connections>
+                                </button>
+                                <button opaque="NO" tag="11" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="wYo-ty-Rwk" userLabel="acceptAudioOnlyButton">
+                                    <rect key="frame" x="125" y="0.0" width="125" height="63"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
+                                    <accessibility key="accessibilityConfiguration" label="Accept"/>
+                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                    <state key="normal" image="call_audio_start_default.png" backgroundImage="color_A.png">
+                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    </state>
+                                    <state key="disabled" image="call_audio_start_disabled.png"/>
+                                    <state key="highlighted" backgroundImage="color_L.png"/>
+                                    <connections>
+                                        <action selector="onAcceptAudioOnlyClick:" destination="-1" eventType="touchUpInside" id="N9h-i1-ejZ"/>
+                                    </connections>
+                                </button>
+                            </subviews>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                        </view>
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                 </view>
@@ -104,11 +156,13 @@
         <image name="call_audio_start_disabled.png" width="36" height="36"/>
         <image name="call_hangup_default.png" width="41" height="36"/>
         <image name="call_hangup_disabled.png" width="41" height="36"/>
-        <image name="color_A.png" width="1" height="1"/>
-        <image name="color_D.png" width="1" height="1"/>
-        <image name="color_F.png" width="1" height="1"/>
-        <image name="color_I.png" width="1" height="1"/>
-        <image name="color_L.png" width="1" height="1"/>
+        <image name="call_video_start_default.png" width="39" height="36"/>
+        <image name="call_video_start_disabled.png" width="39" height="36"/>
+        <image name="color_A.png" width="2" height="2"/>
+        <image name="color_D.png" width="2" height="2"/>
+        <image name="color_F.png" width="2" height="2"/>
+        <image name="color_I.png" width="2" height="2"/>
+        <image name="color_L.png" width="2" height="2"/>
     </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
diff --git a/Classes/Base.lproj/CallView.xib b/Classes/Base.lproj/CallView.xib
index 57c2164b4..f0fe4c55b 100644
--- a/Classes/Base.lproj/CallView.xib
+++ b/Classes/Base.lproj/CallView.xib
@@ -76,7 +76,7 @@
                     <rect key="frame" x="0.0" y="42" width="375" height="625"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <subviews>
-                        <view contentMode="scaleToFill" id="0Ju-u5-N7A" userLabel="conferenceView">
+                        <view hidden="YES" contentMode="scaleToFill" id="0Ju-u5-N7A" userLabel="conferenceView">
                             <rect key="frame" x="0.0" y="0.0" width="375" height="503"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
@@ -100,8 +100,8 @@
                             </subviews>
                             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         </view>
-                        <view hidden="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="9" userLabel="callView">
-                            <rect key="frame" x="0.0" y="0.0" width="375" height="503.00000045117241"/>
+                        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="9" userLabel="callView">
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="503.00000045117235"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="John Doe" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="19" id="KPa-Rm-Qni" userLabel="nameLabel">
@@ -112,7 +112,7 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="01:34" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Oy8-QO-Jwb" userLabel="durationLabel">
-                                    <rect key="frame" x="0.0" y="70" width="375" height="40"/>
+                                    <rect key="frame" x="0.0" y="82" width="375" height="40"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                     <color key="textColor" red="1" green="0.36862745099999999" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -127,16 +127,16 @@
                                     </accessibility>
                                 </imageView>
                                 <view hidden="YES" contentMode="scaleToFill" id="126" userLabel="video">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="503.00000045117241"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="503.00000045117235"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <view contentMode="scaleToFill" id="173" userLabel="background">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="503.00000045117241"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="503.00000045117235"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                                         </view>
                                         <view contentMode="scaleToFill" id="132" userLabel="display">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="503.00000045117241"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="503.00000045117235"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                             <accessibility key="accessibilityConfiguration">
@@ -144,7 +144,7 @@
                                             </accessibility>
                                         </view>
                                         <view contentMode="scaleAspectFit" id="127" userLabel="preview">
-                                            <rect key="frame" x="254.00000029960563" y="355" width="113" height="140.00000012760432"/>
+                                            <rect key="frame" x="254.00000029960563" y="355" width="113" height="140.0000001276043"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         </view>
@@ -189,7 +189,7 @@
                                     <color key="backgroundColor" red="0.2666666667" green="0.2666666667" blue="0.2666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </view>
                                 <button opaque="NO" tag="24" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="7f5-7T-fV3" userLabel="pauseButton" customClass="UIPauseButton">
-                                    <rect key="frame" x="310" y="370.00000045117241" width="52" height="52"/>
+                                    <rect key="frame" x="310" y="370.00000045117235" width="52" height="52"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Pause"/>
                                     <state key="normal" image="pause_big_default.png">
diff --git a/Classes/Base.lproj/ChatConversationView.xib b/Classes/Base.lproj/ChatConversationView.xib
index 3b58bb0a7..7967994aa 100644
--- a/Classes/Base.lproj/ChatConversationView.xib
+++ b/Classes/Base.lproj/ChatConversationView.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F1021" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
@@ -252,8 +252,8 @@
         <image name="chat_attachment_over.png" width="40" height="40"/>
         <image name="chat_send_default.png" width="40" height="40"/>
         <image name="chat_send_over.png" width="40" height="40"/>
-        <image name="color_E.png" width="1" height="1"/>
-        <image name="color_F.png" width="1" height="1"/>
+        <image name="color_E.png" width="2" height="2"/>
+        <image name="color_F.png" width="2" height="2"/>
         <image name="delete_default.png" width="21" height="27"/>
         <image name="delete_disabled.png" width="21" height="27"/>
         <image name="deselect_all_default.png" width="26" height="26"/>
diff --git a/Classes/Base.lproj/DialerView.xib b/Classes/Base.lproj/DialerView.xib
index 8c836273d..6cbae0830 100644
--- a/Classes/Base.lproj/DialerView.xib
+++ b/Classes/Base.lproj/DialerView.xib
@@ -261,11 +261,11 @@
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Call"/>
                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                                    <state key="normal" image="call_start_body_default.png" backgroundImage="color_A.png">
+                                    <state key="normal" image="call_audio_start_default.png" backgroundImage="color_A.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
-                                    <state key="disabled" image="call_start_body_disabled.png"/>
-                                    <state key="highlighted" image="call_start_body_over.png" backgroundImage="color_L.png"/>
+                                    <state key="disabled" image="call_audio_start_disabled.png"/>
+                                    <state key="highlighted" backgroundImage="color_L.png"/>
                                     <connections>
                                         <outlet property="addressField" destination="4" id="235"/>
                                     </connections>
@@ -317,9 +317,8 @@
         <image name="call_add_disabled.png" width="39" height="35"/>
         <image name="call_alt_back_default.png" width="50" height="36"/>
         <image name="call_alt_back_disabled.png" width="50" height="36"/>
-        <image name="call_start_body_default.png" width="51" height="51"/>
-        <image name="call_start_body_disabled.png" width="51" height="51"/>
-        <image name="call_start_body_over.png" width="51" height="51"/>
+        <image name="call_audio_start_default.png" width="36" height="36"/>
+        <image name="call_audio_start_disabled.png" width="36" height="36"/>
         <image name="call_transfer_default.png" width="40" height="36"/>
         <image name="call_transfer_disabled.png" width="40" height="36"/>
         <image name="color_A.png" width="2" height="2"/>
diff --git a/Classes/Base.lproj/HistoryDetailsView.xib b/Classes/Base.lproj/HistoryDetailsView.xib
index 0d24d7190..75b71fbba 100644
--- a/Classes/Base.lproj/HistoryDetailsView.xib
+++ b/Classes/Base.lproj/HistoryDetailsView.xib
@@ -113,6 +113,8 @@
                                     <state key="normal" title="Button" image="call_start_body_default.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
+                                    <state key="disabled" image="call_start_body_disabled.png"/>
+                                    <state key="highlighted" image="call_start_body_over.png"/>
                                     <connections>
                                         <action selector="onCallClick:" destination="-1" eventType="touchUpInside" id="Vlx-14-3CH"/>
                                     </connections>
@@ -159,6 +161,8 @@
         <image name="back_default.png" width="24" height="21"/>
         <image name="back_disabled.png" width="24" height="21"/>
         <image name="call_start_body_default.png" width="51" height="51"/>
+        <image name="call_start_body_disabled.png" width="51" height="51"/>
+        <image name="call_start_body_over.png" width="51" height="51"/>
         <image name="chat_start_body_default.png" width="51" height="51"/>
         <image name="color_F.png" width="2" height="2"/>
         <image name="contact_add_default.png" width="34" height="29"/>
diff --git a/Classes/CallIncomingView.h b/Classes/CallIncomingView.h
index 29d22217a..05d12b915 100644
--- a/Classes/CallIncomingView.h
+++ b/Classes/CallIncomingView.h
@@ -26,7 +26,7 @@
 
 @protocol IncomingCallViewDelegate <NSObject>
 
-- (void)incomingCallAccepted:(LinphoneCall *)call;
+- (void)incomingCallAccepted:(LinphoneCall *)call evenWithVideo:(BOOL)video;
 - (void)incomingCallDeclined:(LinphoneCall *)call;
 - (void)incomingCallAborted:(LinphoneCall *)call;
 
@@ -39,8 +39,11 @@
 @property(nonatomic, strong) IBOutlet UIRoundedImageView *avatarImage;
 @property(nonatomic, assign) LinphoneCall *call;
 @property(nonatomic, strong) id<IncomingCallViewDelegate> delegate;
+@property(weak, nonatomic) IBOutlet UIView *tabVideoBar;
+@property(weak, nonatomic) IBOutlet UIView *tabBar;
 
 - (IBAction)onAcceptClick:(id)event;
 - (IBAction)onDeclineClick:(id)event;
+- (IBAction)onAcceptAudioOnlyClick:(id)sender;
 
 @end
diff --git a/Classes/CallIncomingView.m b/Classes/CallIncomingView.m
index 359b3764c..616c0cba4 100644
--- a/Classes/CallIncomingView.m
+++ b/Classes/CallIncomingView.m
@@ -99,6 +99,9 @@ static UICompositeViewDescription *compositeDescription = nil;
 	_addressLabel.text = [NSString stringWithUTF8String:uri];
 	ms_free(uri);
 	[_avatarImage setImage:[FastAddressBook imageForAddress:addr thumbnail:NO] bordered:YES withRoundedRadius:YES];
+
+	_tabBar.hidden = linphone_call_params_video_enabled(linphone_call_get_remote_params(_call));
+	_tabVideoBar.hidden = !_tabBar.hidden;
 }
 
 #pragma mark - Property Functions
@@ -113,7 +116,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 - (IBAction)onAcceptClick:(id)event {
 	[self dismiss];
-	[_delegate incomingCallAccepted:_call];
+	[_delegate incomingCallAccepted:_call evenWithVideo:YES];
 }
 
 - (IBAction)onDeclineClick:(id)event {
@@ -121,6 +124,11 @@ static UICompositeViewDescription *compositeDescription = nil;
 	[_delegate incomingCallDeclined:_call];
 }
 
+- (IBAction)onAcceptAudioOnlyClick:(id)sender {
+	[self dismiss];
+	[_delegate incomingCallAccepted:_call evenWithVideo:NO];
+}
+
 #pragma mark - TPMultiLayoutViewController Functions
 
 - (NSDictionary *)attributesForView:(UIView *)view {
diff --git a/Classes/LinphoneManager.h b/Classes/LinphoneManager.h
index a3ce8ce06..bd25e7351 100644
--- a/Classes/LinphoneManager.h
+++ b/Classes/LinphoneManager.h
@@ -160,7 +160,7 @@ typedef struct _LinphoneManagerSounds {
 + (NSString*)documentFile:(NSString*)file;
 + (NSString*)cacheDirectory;
 
-- (void)acceptCall:(LinphoneCall *)call;
+- (void)acceptCall:(LinphoneCall *)call evenWithVideo:(BOOL)video;
 - (void)call:(NSString *)address displayName:(NSString*)displayName transfer:(BOOL)transfer;
 
 
diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index ba56ef133..631eb0b6f 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -1549,7 +1549,7 @@ static int comp_call_id(const LinphoneCall *call, const char *callid) {
 	MSList *calls = (MSList *)linphone_core_get_calls(theLinphoneCore);
 	MSList *call = ms_list_find_custom(calls, (MSCompareFunc)comp_call_id, [callid UTF8String]);
 	if (call != NULL) {
-		[self acceptCall:(LinphoneCall *)call->data];
+		[self acceptCall:(LinphoneCall *)call->data evenWithVideo:YES];
 		return;
 	};
 }
@@ -1853,7 +1853,7 @@ static void audioRouteChangeListenerCallback(void *inUserData,					  // 1
 
 #pragma mark - Call Functions
 
-- (void)acceptCall:(LinphoneCall *)call {
+- (void)acceptCall:(LinphoneCall *)call evenWithVideo:(BOOL)video {
 	LinphoneCallParams *lcallParams = linphone_core_create_call_params(theLinphoneCore, call);
 	if ([self lpConfigBoolForKey:@"edge_opt_preference"]) {
 		bool low_bandwidth = self.network == network_2g;
@@ -1862,6 +1862,9 @@ static void audioRouteChangeListenerCallback(void *inUserData,					  // 1
 		}
 		linphone_call_params_enable_low_bandwidth(lcallParams, low_bandwidth);
 	}
+	if (!video) {
+		linphone_call_params_enable_video(lcallParams, NO);
+	}
 
 	linphone_core_accept_call_with_params(theLinphoneCore, call, lcallParams);
 }
diff --git a/Classes/LinphoneUI/UICallButton.m b/Classes/LinphoneUI/UICallButton.m
index 32b5381a5..ab5496e54 100644
--- a/Classes/LinphoneUI/UICallButton.m
+++ b/Classes/LinphoneUI/UICallButton.m
@@ -99,9 +99,9 @@
 		[self setImage:[UIImage imageNamed:@"call_video_start_over.png"] forState:UIControlStateHighlighted];
 		[self setImage:[UIImage imageNamed:@"call_video_start_disabled.png"] forState:UIControlStateDisabled];
 	} else {
-		[self setImage:[UIImage imageNamed:@"call_start_body_default.png"] forState:UIControlStateNormal];
-		[self setImage:[UIImage imageNamed:@"call_start_body_over.png"] forState:UIControlStateHighlighted];
-		[self setImage:[UIImage imageNamed:@"call_start_body_disabled.png"] forState:UIControlStateDisabled];
+		[self setImage:[UIImage imageNamed:@"call_audio_start_default.png"] forState:UIControlStateNormal];
+		[self setImage:[UIImage imageNamed:@"call_audio_start_over.png"] forState:UIControlStateHighlighted];
+		[self setImage:[UIImage imageNamed:@"call_audio_start_disabled.png"] forState:UIControlStateDisabled];
 	}
 }
 @end
diff --git a/Classes/LinphoneUI/UIContactDetailsCell.xib b/Classes/LinphoneUI/UIContactDetailsCell.xib
index 5dcda06d0..6eaf6bd09 100644
--- a/Classes/LinphoneUI/UIContactDetailsCell.xib
+++ b/Classes/LinphoneUI/UIContactDetailsCell.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F1021" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
@@ -30,7 +30,7 @@
                             <textInputTraits key="textInputTraits"/>
                         </textField>
                         <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="C2f-aP-xjR" userLabel="deleteButton" customClass="UIIconButton">
-                            <rect key="frame" x="340" y="6.9999998782131989" width="30" height="30"/>
+                            <rect key="frame" x="340" y="6.9999997995414533" width="30" height="30"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
                             <state key="normal" title="Button" image="delete_field_default.png">
                                 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -49,17 +49,19 @@
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                     <subviews>
                         <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="ZbV-2Z-b4y" userLabel="callButton" customClass="UIIconButton">
-                            <rect key="frame" x="135" y="40.000000216744155" width="44" height="44"/>
+                            <rect key="frame" x="135" y="40" width="44" height="44"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
                             <state key="normal" title="Button" image="call_start_body_default.png">
                                 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                             </state>
+                            <state key="disabled" image="call_start_body_disabled.png"/>
+                            <state key="highlighted" image="call_start_body_over.png"/>
                             <connections>
                                 <action selector="onCallClick:" destination="-1" eventType="touchUpInside" id="nVk-zG-i8I"/>
                             </connections>
                         </button>
                         <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="FDT-HY-OQZ" userLabel="chatButton" customClass="UIIconButton">
-                            <rect key="frame" x="195" y="40.000000216744155" width="44" height="44"/>
+                            <rect key="frame" x="195" y="40" width="44" height="44"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
                             <state key="normal" title="Button" image="chat_start_body_default.png">
                                 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -72,7 +74,7 @@
                             <rect key="frame" x="8" y="0.0" width="359" height="44"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                     </subviews>
@@ -86,6 +88,8 @@
     </objects>
     <resources>
         <image name="call_start_body_default.png" width="51" height="51"/>
+        <image name="call_start_body_disabled.png" width="51" height="51"/>
+        <image name="call_start_body_over.png" width="51" height="51"/>
         <image name="chat_start_body_default.png" width="51" height="51"/>
         <image name="delete_field_default.png" width="27" height="27"/>
         <image name="delete_field_over.png" width="27" height="27"/>
diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m
index 275cbbce8..5f252e369 100644
--- a/Classes/PhoneMainView.m
+++ b/Classes/PhoneMainView.m
@@ -694,7 +694,7 @@ static RootViewManager *rootViewManagerInstance = nil;
 
 		if (callIDFromPush && autoAnswer) {
 			// accept call automatically
-			[lm acceptCall:call];
+			[lm acceptCall:call evenWithVideo:YES];
 		} else {
 			AudioServicesPlaySystemSound(lm.sounds.vibrate);
 			CallIncomingView *view = VIEW(CallIncomingView);
@@ -745,8 +745,8 @@ static RootViewManager *rootViewManagerInstance = nil;
 - (void)incomingCallAborted:(LinphoneCall *)call {
 }
 
-- (void)incomingCallAccepted:(LinphoneCall *)call {
-	[[LinphoneManager instance] acceptCall:call];
+- (void)incomingCallAccepted:(LinphoneCall *)call evenWithVideo:(BOOL)video {
+	[[LinphoneManager instance] acceptCall:call evenWithVideo:video];
 }
 
 - (void)incomingCallDeclined:(LinphoneCall *)call {
diff --git a/Resources/images/back_disabled.png b/Resources/images/back_disabled.png
index 2d5d4316f..d7388da99 100644
Binary files a/Resources/images/back_disabled.png and b/Resources/images/back_disabled.png differ
diff --git a/Resources/images/backspace_disabled.png b/Resources/images/backspace_disabled.png
index ecc88b156..21cb9ac53 100644
Binary files a/Resources/images/backspace_disabled.png and b/Resources/images/backspace_disabled.png differ
diff --git a/Resources/images/call_add_disabled.png b/Resources/images/call_add_disabled.png
index ccda6630c..aefff9393 100644
Binary files a/Resources/images/call_add_disabled.png and b/Resources/images/call_add_disabled.png differ
diff --git a/Resources/images/call_alt_back_disabled.png b/Resources/images/call_alt_back_disabled.png
index 4e7ec5acf..3e79e0193 100644
Binary files a/Resources/images/call_alt_back_disabled.png and b/Resources/images/call_alt_back_disabled.png differ
diff --git a/Resources/images/call_alt_start_disabled.png b/Resources/images/call_alt_start_disabled.png
index 78ebaa685..033b10d6c 100644
Binary files a/Resources/images/call_alt_start_disabled.png and b/Resources/images/call_alt_start_disabled.png differ
diff --git a/Resources/images/call_audio_start_disabled.png b/Resources/images/call_audio_start_disabled.png
index f015a9fcb..d98d06745 100644
Binary files a/Resources/images/call_audio_start_disabled.png and b/Resources/images/call_audio_start_disabled.png differ
diff --git a/Resources/images/call_back_disabled.png b/Resources/images/call_back_disabled.png
index bf8ef2cbe..6f897c385 100644
Binary files a/Resources/images/call_back_disabled.png and b/Resources/images/call_back_disabled.png differ
diff --git a/Resources/images/call_hangup_disabled.png b/Resources/images/call_hangup_disabled.png
index e39a17b34..554fd3fe6 100644
Binary files a/Resources/images/call_hangup_disabled.png and b/Resources/images/call_hangup_disabled.png differ
diff --git a/Resources/images/call_transfer_disabled.png b/Resources/images/call_transfer_disabled.png
index fb1ad39ac..39dac7ef1 100644
Binary files a/Resources/images/call_transfer_disabled.png and b/Resources/images/call_transfer_disabled.png differ
diff --git a/Resources/images/call_video_start_disabled.png b/Resources/images/call_video_start_disabled.png
index bc6366888..9bb106fa9 100644
Binary files a/Resources/images/call_video_start_disabled.png and b/Resources/images/call_video_start_disabled.png differ
diff --git a/Resources/images/camera_disabled.png b/Resources/images/camera_disabled.png
index dae75ba72..dff746bdf 100644
Binary files a/Resources/images/camera_disabled.png and b/Resources/images/camera_disabled.png differ
diff --git a/Resources/images/cancel_edit_disabled.png b/Resources/images/cancel_edit_disabled.png
index c1a47eb79..d0d9b1c69 100644
Binary files a/Resources/images/cancel_edit_disabled.png and b/Resources/images/cancel_edit_disabled.png differ
diff --git a/Resources/images/chat_add_disabled.png b/Resources/images/chat_add_disabled.png
index ec24ae436..75798ff3c 100644
Binary files a/Resources/images/chat_add_disabled.png and b/Resources/images/chat_add_disabled.png differ
diff --git a/Resources/images/chat_attachment_disabled.png b/Resources/images/chat_attachment_disabled.png
index b95ad9840..e6e0d5462 100644
Binary files a/Resources/images/chat_attachment_disabled.png and b/Resources/images/chat_attachment_disabled.png differ
diff --git a/Resources/images/chat_send_disabled.png b/Resources/images/chat_send_disabled.png
index 8d5a1968c..14da0414f 100644
Binary files a/Resources/images/chat_send_disabled.png and b/Resources/images/chat_send_disabled.png differ
diff --git a/Resources/images/color_A.png b/Resources/images/color_A.png
index 4dcc1dcc2..f0d42bfb7 100644
Binary files a/Resources/images/color_A.png and b/Resources/images/color_A.png differ
diff --git a/Resources/images/color_B.png b/Resources/images/color_B.png
index 5f404ea3e..56f1c1dae 100644
Binary files a/Resources/images/color_B.png and b/Resources/images/color_B.png differ
diff --git a/Resources/images/color_C.png b/Resources/images/color_C.png
index ac02a94e7..acc3c92b3 100644
Binary files a/Resources/images/color_C.png and b/Resources/images/color_C.png differ
diff --git a/Resources/images/color_D.png b/Resources/images/color_D.png
index 467a50f30..f87e8b179 100644
Binary files a/Resources/images/color_D.png and b/Resources/images/color_D.png differ
diff --git a/Resources/images/color_E.png b/Resources/images/color_E.png
index 883f29232..9bc0935d9 100644
Binary files a/Resources/images/color_E.png and b/Resources/images/color_E.png differ
diff --git a/Resources/images/color_F.png b/Resources/images/color_F.png
index 009877cef..04359719d 100644
Binary files a/Resources/images/color_F.png and b/Resources/images/color_F.png differ
diff --git a/Resources/images/color_G.png b/Resources/images/color_G.png
index f18c22483..ca4997acc 100644
Binary files a/Resources/images/color_G.png and b/Resources/images/color_G.png differ
diff --git a/Resources/images/color_H.png b/Resources/images/color_H.png
index b330fb051..bd069290a 100644
Binary files a/Resources/images/color_H.png and b/Resources/images/color_H.png differ
diff --git a/Resources/images/color_I.png b/Resources/images/color_I.png
index 02e3356d4..dde3ce38b 100644
Binary files a/Resources/images/color_I.png and b/Resources/images/color_I.png differ
diff --git a/Resources/images/color_J.png b/Resources/images/color_J.png
index aeca89df4..a3eb8445c 100644
Binary files a/Resources/images/color_J.png and b/Resources/images/color_J.png differ
diff --git a/Resources/images/color_K.png b/Resources/images/color_K.png
index c50752d94..535d65e4c 100644
Binary files a/Resources/images/color_K.png and b/Resources/images/color_K.png differ
diff --git a/Resources/images/color_L.png b/Resources/images/color_L.png
index be2e562d6..505c465f1 100644
Binary files a/Resources/images/color_L.png and b/Resources/images/color_L.png differ
diff --git a/Resources/images/color_M.png b/Resources/images/color_M.png
index 7d9a17982..e630a14cb 100644
Binary files a/Resources/images/color_M.png and b/Resources/images/color_M.png differ
diff --git a/Resources/images/conference_start_disabled.png b/Resources/images/conference_start_disabled.png
index 662dd3818..096f5ecb5 100644
Binary files a/Resources/images/conference_start_disabled.png and b/Resources/images/conference_start_disabled.png differ
diff --git a/Resources/images/contact_add_disabled.png b/Resources/images/contact_add_disabled.png
index 8f4d204b3..86ab90de8 100644
Binary files a/Resources/images/contact_add_disabled.png and b/Resources/images/contact_add_disabled.png differ
diff --git a/Resources/images/contacts_all_disabled.png b/Resources/images/contacts_all_disabled.png
index 7f71d239f..33ca24a2c 100644
Binary files a/Resources/images/contacts_all_disabled.png and b/Resources/images/contacts_all_disabled.png differ
diff --git a/Resources/images/contacts_sip_disabled.png b/Resources/images/contacts_sip_disabled.png
index 67f5ac970..c1880929c 100644
Binary files a/Resources/images/contacts_sip_disabled.png and b/Resources/images/contacts_sip_disabled.png differ
diff --git a/Resources/images/delete_disabled.png b/Resources/images/delete_disabled.png
index 1f7f5ef95..359a1d633 100644
Binary files a/Resources/images/delete_disabled.png and b/Resources/images/delete_disabled.png differ
diff --git a/Resources/images/deselect_all_disabled.png b/Resources/images/deselect_all_disabled.png
index 48f36f1ed..da6e49b65 100644
Binary files a/Resources/images/deselect_all_disabled.png and b/Resources/images/deselect_all_disabled.png differ
diff --git a/Resources/images/dialer_alt_back_disabled.png b/Resources/images/dialer_alt_back_disabled.png
index d05afcb38..bb0a2cde6 100644
Binary files a/Resources/images/dialer_alt_back_disabled.png and b/Resources/images/dialer_alt_back_disabled.png differ
diff --git a/Resources/images/dialer_back_disabled.png b/Resources/images/dialer_back_disabled.png
index edd05e9f1..405ac4d38 100644
Binary files a/Resources/images/dialer_back_disabled.png and b/Resources/images/dialer_back_disabled.png differ
diff --git a/Resources/images/edit_disabled.png b/Resources/images/edit_disabled.png
index 9684b40fd..4fb760c36 100644
Binary files a/Resources/images/edit_disabled.png and b/Resources/images/edit_disabled.png differ
diff --git a/Resources/images/edit_list_disabled.png b/Resources/images/edit_list_disabled.png
index 38edb8791..9d5214f49 100644
Binary files a/Resources/images/edit_list_disabled.png and b/Resources/images/edit_list_disabled.png differ
diff --git a/Resources/images/footer_chat_disabled.png b/Resources/images/footer_chat_disabled.png
index ead4a6bbd..f4406479c 100644
Binary files a/Resources/images/footer_chat_disabled.png and b/Resources/images/footer_chat_disabled.png differ
diff --git a/Resources/images/footer_contacts_disabled.png b/Resources/images/footer_contacts_disabled.png
index 43864d900..90718906a 100644
Binary files a/Resources/images/footer_contacts_disabled.png and b/Resources/images/footer_contacts_disabled.png differ
diff --git a/Resources/images/footer_dialer_disabled.png b/Resources/images/footer_dialer_disabled.png
index 73342317a..6d8143336 100644
Binary files a/Resources/images/footer_dialer_disabled.png and b/Resources/images/footer_dialer_disabled.png differ
diff --git a/Resources/images/footer_history_disabled.png b/Resources/images/footer_history_disabled.png
index 975bf9c75..2a46ff9b4 100644
Binary files a/Resources/images/footer_history_disabled.png and b/Resources/images/footer_history_disabled.png differ
diff --git a/Resources/images/history_all_disabled.png b/Resources/images/history_all_disabled.png
index 3bea4175d..ff9d2e304 100644
Binary files a/Resources/images/history_all_disabled.png and b/Resources/images/history_all_disabled.png differ
diff --git a/Resources/images/history_missed_disabled.png b/Resources/images/history_missed_disabled.png
index d439f5718..5f2590b3d 100644
Binary files a/Resources/images/history_missed_disabled.png and b/Resources/images/history_missed_disabled.png differ
diff --git a/Resources/images/micro_disabled.png b/Resources/images/micro_disabled.png
index 8e88ce65d..94ddb49cd 100644
Binary files a/Resources/images/micro_disabled.png and b/Resources/images/micro_disabled.png differ
diff --git a/Resources/images/options_add_call_disabled.png b/Resources/images/options_add_call_disabled.png
index 79b788e0f..45a319d40 100644
Binary files a/Resources/images/options_add_call_disabled.png and b/Resources/images/options_add_call_disabled.png differ
diff --git a/Resources/images/options_disabled.png b/Resources/images/options_disabled.png
index e2fd3bc16..eb35776d9 100644
Binary files a/Resources/images/options_disabled.png and b/Resources/images/options_disabled.png differ
diff --git a/Resources/images/options_start_conference_disabled.png b/Resources/images/options_start_conference_disabled.png
index 86be52305..2ebd0246a 100644
Binary files a/Resources/images/options_start_conference_disabled.png and b/Resources/images/options_start_conference_disabled.png differ
diff --git a/Resources/images/options_transfer_call_disabled.png b/Resources/images/options_transfer_call_disabled.png
index f82f2e733..ab1cabb8b 100644
Binary files a/Resources/images/options_transfer_call_disabled.png and b/Resources/images/options_transfer_call_disabled.png differ
diff --git a/Resources/images/route_bluetooth_disabled.png b/Resources/images/route_bluetooth_disabled.png
index fd935fe2a..6066f75c8 100644
Binary files a/Resources/images/route_bluetooth_disabled.png and b/Resources/images/route_bluetooth_disabled.png differ
diff --git a/Resources/images/route_earpiece_disabled.png b/Resources/images/route_earpiece_disabled.png
index 1628518c8..1d6a85e31 100644
Binary files a/Resources/images/route_earpiece_disabled.png and b/Resources/images/route_earpiece_disabled.png differ
diff --git a/Resources/images/route_speaker_disabled.png b/Resources/images/route_speaker_disabled.png
index ffe8e89c7..f097b4f7c 100644
Binary files a/Resources/images/route_speaker_disabled.png and b/Resources/images/route_speaker_disabled.png differ
diff --git a/Resources/images/routes_disabled.png b/Resources/images/routes_disabled.png
index e76afa109..d7d676325 100644
Binary files a/Resources/images/routes_disabled.png and b/Resources/images/routes_disabled.png differ
diff --git a/Resources/images/select_all_disabled.png b/Resources/images/select_all_disabled.png
index 56c69ba3b..44b82264d 100644
Binary files a/Resources/images/select_all_disabled.png and b/Resources/images/select_all_disabled.png differ
diff --git a/Resources/images/speaker_disabled.png b/Resources/images/speaker_disabled.png
index ffe8e89c7..f097b4f7c 100644
Binary files a/Resources/images/speaker_disabled.png and b/Resources/images/speaker_disabled.png differ
diff --git a/Resources/images/valid_disabled.png b/Resources/images/valid_disabled.png
index 8ac9588de..e4bafb910 100644
Binary files a/Resources/images/valid_disabled.png and b/Resources/images/valid_disabled.png differ