diff --git a/Classes/CallView.m b/Classes/CallView.m
index 40ecb738f..d1d269088 100644
--- a/Classes/CallView.m
+++ b/Classes/CallView.m
@@ -232,11 +232,12 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 	[_speakerButton update];
 	[_microButton update];
+	[_pauseButton setType:UIPauseButtonType_CurrentCall call:call];
 	[_pauseButton update];
 	[_videoButton update];
 	[_hangupButton update];
 
-	_optionsButton.enabled = !linphone_call_media_in_progress(call);
+	_optionsButton.enabled = (call && !linphone_call_media_in_progress(call));
 
 	// Show Pause/Conference button following call count
 	if (linphone_core_get_calls_nb(lc) > 1) {
@@ -400,9 +401,6 @@ static UICompositeViewDescription *compositeDescription = nil;
 	[_videoGroup setAlpha:0.0];
 	[PhoneMainView.instance showTabBar:true];
 
-	//	UIEdgeInsets insets = {10, 0, 25, 0};
-	//	[_pausedCallsTableView.tableView setContentInset:insets];
-	//	[_pausedCallsTableView.tableView setScrollIndicatorInsets:insets];
 	[_pausedCallsTable.tableView setAlpha:1.0];
 
 	[_videoCameraSwitch setHidden:TRUE];
diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index bdb2ba85b..3219f6dbd 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -1317,6 +1317,7 @@ static LinphoneCoreVTable linphonec_vtable = {.show = NULL,
 	const char *lRingBack = [[LinphoneManager bundleFile:@"ringback.wav"] UTF8String];
 	linphone_core_set_ringback(theLinphoneCore, lRingBack);
 	const char *lPlay = [[LinphoneManager bundleFile:@"hold.wav"] UTF8String];
+	lPlay = NULL;
 	linphone_core_set_play_file(theLinphoneCore, lPlay);
 
 	linphone_core_set_zrtp_secrets_file(theLinphoneCore, [zrtpSecretsFileName UTF8String]);
diff --git a/Classes/LinphoneUI/UICallPausedCell.h b/Classes/LinphoneUI/UICallPausedCell.h
index 908ab0082..85bf8f09f 100644
--- a/Classes/LinphoneUI/UICallPausedCell.h
+++ b/Classes/LinphoneUI/UICallPausedCell.h
@@ -8,12 +8,14 @@
 
 #import "UIRoundedImageView.h"
 #import "LinphoneManager.h"
+#import "UIPauseButton.h"
 
 @interface UICallPausedCell : UITableViewCell
 
 @property(weak, nonatomic) IBOutlet UIRoundedImageView *avatarImage;
 @property(weak, nonatomic) IBOutlet UILabel *nameLabel;
 @property(weak, nonatomic) IBOutlet UILabel *durationLabel;
+@property(weak, nonatomic) IBOutlet UIPauseButton *pauseButton;
 
 - (id)initWithIdentifier:(NSString *)identifier;
 - (void)setCall:(LinphoneCall *)call;
diff --git a/Classes/LinphoneUI/UICallPausedCell.m b/Classes/LinphoneUI/UICallPausedCell.m
index ac8b474e9..d68f9b58c 100644
--- a/Classes/LinphoneUI/UICallPausedCell.m
+++ b/Classes/LinphoneUI/UICallPausedCell.m
@@ -33,6 +33,9 @@
 		return;
 	}
 
+	[_pauseButton setType:UIPauseButtonType_Call call:call];
+	[_pauseButton update];
+
 	const LinphoneAddress *addr = linphone_call_get_remote_address(call);
 	[ContactDisplay setDisplayNameLabel:_nameLabel forAddress:addr];
 
diff --git a/Classes/LinphoneUI/UICallPausedCell.xib b/Classes/LinphoneUI/UICallPausedCell.xib
index e3169004a..505f601cf 100644
--- a/Classes/LinphoneUI/UICallPausedCell.xib
+++ b/Classes/LinphoneUI/UICallPausedCell.xib
@@ -10,6 +10,7 @@
                 <outlet property="avatarImage" destination="NBJ-w0-Uvw" id="lGx-U6-4tn"/>
                 <outlet property="durationLabel" destination="tZi-KI-viq" id="TLb-yi-TBY"/>
                 <outlet property="nameLabel" destination="g3t-eS-m7B" id="dKD-7X-u2j"/>
+                <outlet property="pauseButton" destination="Izu-Zj-sHi" id="BEq-dn-lx2"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
@@ -51,7 +52,7 @@
                     </attributedString>
                     <nil key="highlightedColor"/>
                 </label>
-                <button opaque="NO" tag="24" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Izu-Zj-sHi" userLabel="pauseButton" customClass="UIPauseButton">
+                <button opaque="NO" tag="24" contentMode="scaleToFill" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Izu-Zj-sHi" userLabel="pauseButton" customClass="UIPauseButton">
                     <rect key="frame" x="322" y="3" width="45" height="45"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                     <accessibility key="accessibilityConfiguration" label="Pause"/>