diff --git a/Classes/Base.lproj/DialerView~ipad.xib b/Classes/Base.lproj/DialerView~ipad.xib
index 6b554e8bf..af249e670 100644
--- a/Classes/Base.lproj/DialerView~ipad.xib
+++ b/Classes/Base.lproj/DialerView~ipad.xib
@@ -46,7 +46,7 @@
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         </imageView>
                         <imageView userInteractionEnabled="NO" tag="2" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="dialer_background.png" id="tsy-aZ-cHg" userLabel="logoImage">
-                            <rect key="frame" x="245" y="267" width="310" height="177"/>
+                            <rect key="frame" x="8" y="112" width="784" height="480"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                         </imageView>
                         <view tag="3" contentMode="scaleAspectFill" id="30b-JN-Ibj" userLabel="preview">
@@ -709,7 +709,7 @@
         <image name="color_L.png" width="2" height="2"/>
         <image name="contact_add_default.png" width="34" height="29"/>
         <image name="contact_add_disabled.png" width="34" height="29"/>
-        <image name="dialer_background.png" width="85" height="77"/>
+        <image name="dialer_background.png" width="246" height="211"/>
         <image name="numpad_0_default.png" width="52" height="48"/>
         <image name="numpad_0_over.png" width="52" height="48"/>
         <image name="numpad_1_default.png" width="52" height="48"/>
diff --git a/Classes/ChatsListTableView.m b/Classes/ChatsListTableView.m
index 21d1d0d66..028e52477 100644
--- a/Classes/ChatsListTableView.m
+++ b/Classes/ChatsListTableView.m
@@ -154,7 +154,7 @@ static void chatTable_free_chatrooms(void *data) {
 		[view setChatRoom:chatRoom];
 		// on iPad, force unread bubble to disappear by reloading the cell
 		if (IPAD) {
-			UIChatCell *cell = [tableView cellForRowAtIndexPath:indexPath];
+			UIChatCell *cell = (UIChatCell *)[tableView cellForRowAtIndexPath:indexPath];
 			[cell updateUnreadBadge];
 		}
 		[PhoneMainView.instance changeCurrentView:view.compositeViewDescription push:TRUE];
diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 7e160f0e1..51e3ebcdf 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -1453,19 +1453,19 @@ static BOOL libStarted = FALSE;
 
 	// Set audio assets
 	NSString *ring =
-		([LinphoneManager
-			 bundleFile:[NSString stringWithUTF8String:linphone_core_get_ringback(theLinphoneCore)].lastPathComponent]
+		([LinphoneManager bundleFile:[NSString stringWithUTF8String:linphone_core_get_ringback(theLinphoneCore) ?: ""]
+										 .lastPathComponent]
 			 ?: [LinphoneManager bundleFile:@"notes_of_the_optimistic.caf"])
 			.lastPathComponent;
 	NSString *ringback =
 		([LinphoneManager
-			 bundleFile:[NSString stringWithUTF8String:linphone_core_get_remote_ringback_tone(theLinphoneCore)]
+			 bundleFile:[NSString stringWithUTF8String:linphone_core_get_remote_ringback_tone(theLinphoneCore) ?: ""]
 							.lastPathComponent]
 			 ?: [LinphoneManager bundleFile:@"ringback.wav"])
 			.lastPathComponent;
 	NSString *hold =
-		([LinphoneManager
-			 bundleFile:[NSString stringWithUTF8String:linphone_core_get_play_file(theLinphoneCore)].lastPathComponent]
+		([LinphoneManager bundleFile:[NSString stringWithUTF8String:linphone_core_get_play_file(theLinphoneCore) ?: ""]
+										 .lastPathComponent]
 			 ?: [LinphoneManager bundleFile:@"hold.caf"])
 			.lastPathComponent;
 
diff --git a/Resources/images/dialer_background.png b/Resources/images/dialer_background.png
index 053ab339d..d1e2f183f 100644
Binary files a/Resources/images/dialer_background.png and b/Resources/images/dialer_background.png differ
diff --git a/Resources/images/dialer_background@2x.png b/Resources/images/dialer_background@2x.png
index 425d31aa4..1dbc0fcb1 100644
Binary files a/Resources/images/dialer_background@2x.png and b/Resources/images/dialer_background@2x.png differ