diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 82ad45dec..a823a14ad 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,12 +2,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.linphone"
    
-      android:versionCode="2599" android:installLocation="auto">
+      android:versionCode="1000" android:installLocation="auto">
     <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23"/>
     
     <!-- Permissions for Push Notification -->
-    <permission android:name="org.linphone.permission.C2D_MESSAGE" android:protectionLevel="signature" /> <!-- Change package ! -->
-	<uses-permission android:name="org.linphone.permission.C2D_MESSAGE" />  <!-- Change package ! -->
+    <permission android:name="com.orangecyberdefense.securephone.permission.C2D_MESSAGE" android:protectionLevel="signature" /> <!-- Change package ! -->
+	<uses-permission android:name="com.orangecyberdefense.securephone.permission.C2D_MESSAGE" />  <!-- Change package ! -->
 	<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
 
 	<uses-permission android:name="android.permission.INTERNET"/>
@@ -204,7 +204,7 @@
 		  <intent-filter>
 		    <action android:name="com.google.android.c2dm.intent.RECEIVE" />
 		    <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
-		    <category android:name="org.linphone" /> <!-- Change package ! -->
+		    <category android:name="com.orangecyberdefense.securephone" /> <!-- Change package ! -->
 		  </intent-filter>
 		</receiver>
 		
diff --git a/custom_rules.xml b/custom_rules.xml
index ae628ecd4..16a38c746 100644
--- a/custom_rules.xml
+++ b/custom_rules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="custom_rules">
-	<property name="linphone.package.name" value="org.linphone" />
+	<property name="linphone.package.name" value="com.orangecyberdefense.securephone" />
 
 	<target name="-pre-build" description="Move file that is not to be compiled.">
 		<copy file="submodules/linphone/share/xml/lpconfig.xsd"
diff --git a/release.patch b/release.patch
index c6f3f3c2f..6b0746007 100644
--- a/release.patch
+++ b/release.patch
@@ -6,8 +6,8 @@ index 5ef1374..86e13be 100644
  
  	<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true"/>
      
--    <application android:label="@string/app_name" android:icon="@drawable/logo_linphone_57x57" android:largeHeap="true" android:allowBackup="true">
-+    <application android:label="@string/app_name" android:icon="@drawable/logo_linphone_57x57" android:largeHeap="true" android:allowBackup="true" android:debuggable="false">
+-    <application android:label="@string/app_name" android:icon="@drawable/linphone_logo" android:largeHeap="true" android:allowBackup="true">
++    <application android:label="@string/app_name" android:icon="@drawable/linphone_logo" android:largeHeap="true" android:allowBackup="true" android:debuggable="false">
  
  		<activity android:name="org.linphone.LinphoneLauncherActivity"
  		    android:label="@string/app_name"
diff --git a/res/drawable-xhdpi/linphone_notification_icon.png b/res/drawable-xhdpi/linphone_notification_icon.png
index fa36e433e..755378739 100644
Binary files a/res/drawable-xhdpi/linphone_notification_icon.png and b/res/drawable-xhdpi/linphone_notification_icon.png differ
diff --git a/res/drawable/status_level.xml b/res/drawable/status_level.xml
index 0aafe1562..2852a9c03 100644
--- a/res/drawable/status_level.xml
+++ b/res/drawable/status_level.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <level-list xmlns:android="http://schemas.android.com/apk/res/android">
-	  <item android:maxLevel="0" android:drawable="@drawable/logo_secure_phone_icon" />
+	  <item android:maxLevel="0" android:drawable="@drawable/linphone_notification_icon" />
 	  <item android:maxLevel="1" android:drawable="@drawable/linphone_notification_icon" />
 	  <item android:maxLevel="2" android:drawable="@drawable/linphone_notification_icon" />
 	  <item android:maxLevel="3" android:drawable="@drawable/linphone_notification_icon" />
diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory
index 62874db7a..3619d7e0e 100644
--- a/res/raw/linphonerc_factory
+++ b/res/raw/linphonerc_factory
@@ -4,6 +4,9 @@ mtu=1300
 [app]
 animations=0
 show_login_view=1
+debug_popup_magic=#1234
+debug=1
+server_url=http://85.233.205.218:443/xmlrpc
 
 [sip]
 guess_hostname=1
@@ -13,7 +16,6 @@ auto_net_state_mon=0
 auto_answer_replacing_calls=1
 media_encryption_mandatory=0
 ping_with_options=0
-root_ca=/data/data/org.linphone/files/rootca.pem
 
 [rtp]
 audio_rtp_port=7076
@@ -27,8 +29,6 @@ disable_upnp=1
 playback_dev_id=
 ringer_dev_id=
 capture_dev_id=
-remote_ring=/data/data/org.linphone/files/ringback.wav
-local_ring=/data/data/org.linphone/files/oldphone_mono.wav
 dtmf_player_amp=0.1
 
 [misc]
diff --git a/res/values-fr/custom.xml b/res/values-fr/custom.xml
index 2e1164f4b..ab1262d0d 100644
--- a/res/values-fr/custom.xml
+++ b/res/values-fr/custom.xml
@@ -14,7 +14,7 @@
   <string name="wait_dialog_text">Démarrage</string>
   <string name="notification_registered">Enregistré sur %s</string>
   <string name="notification_register_failure">Échec d\'enregistrement sur %s</string>
-  <string name="about_text">Linphone %s SIP (rfc 3261) compatible téléphone, sous licence GNU Public License V2</string>
+  <string name="about_text">Version %s</string>
   <string name="about_link">http://www.linphone.org\n\nInstructions\nhttp://www.linphone.org/user-guide.html\n\n© 2015 Belledonne Communications</string>
   <string name="setup_welcome">Cet assistant va vous guider pour réaliser des appels à l\'aide d\'un compte SIP.</string>
   <string name="setup_create_account">Créer un compte sur linphone.org</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 09fdc27e2..121445f3c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -12,10 +12,11 @@
   <string name="delete">supprimer</string>
   <string name="retry">Retry</string>
   <string name="cancel">annuler</string>
-  <string name="accept">confirmer</string>
-  <string name="about">About</string>
+  <string name="accept">accepter</string>
+  <string name="about">À propos</string>
+  <string name="download">Télécharger</string>
   <string name="deny">refuser</string>
-  <string name="no_account">No account configured</string>
+  <string name="no_account">Aucun compte configuré</string>
   <string name="address_sip">Adresse Sip</string>
 
   <!-- splashscreen -->
@@ -42,11 +43,11 @@
   <string name="assistant_connect">connexion</string>
 
   <!-- 1. Dailer -->
-  <string name="address_bar_hint">Enter a number or an address</string>
+  <string name="address_bar_hint">Entrez une adresse SIP ou un numéro</string>
 
   <!-- 2. History -->
-  <string name="no_call_history">No call in your history</string>
-  <string name="no_missed_call_history">No missed call in your history</string>
+  <string name="no_call_history">Aucun appel dans votre historique.</string>
+  <string name="no_missed_call_history">Aucun appel manqué dans votre historique.</string>
   <string name="delete_history_log">Do you want to delete selected log?</string>
   <string name="history_log_label">appel reçu</string>
   <string name="today">Aujourd\'hui</string>
@@ -54,22 +55,23 @@
 
 
   <!-- 3. Contacts -->
-  <string name="no_contact">No contact in your address book.</string>
-  <string name="no_sip_contact">No SIP contact in your address book.</string>
+  <string name="no_contact">Aucun contact dans votre carnet d\'adresse.</string>
+  <string name="no_sip_contact">Aucun contact SIP dans votre carnet d\'adresse.</string>
   <string name="delete_contacts">Do you want to delete selected contact?</string>
   <string name="delete_contact">Do you want to delete selected this contact?</string>
   <string name="search_contact">Rechercher un contact</string>
 
   <!-- 4. Chat -->
-  <string name="no_chat_history">No conversations</string>
+  <string name="no_chat_history">Aucun historique de chat.</string>
   <string name="delete_conversation">Do you want to delete selected conversation?</string>
   <string name="delete_message">Do you want to delete selected message?</string>
+  <string name="search">Chercher un contact</string>
 
   <!-- Side Menu -->
   <string-array name="side_menu_item">
     <item>Assistant</item>
     <item>Settings</item>
-    <item>About</item>
+    <item>A propos</item>
   </string-array>
   <string name="quit">Quitter</string>
 
@@ -80,4 +82,11 @@
   <string name="no_current_call">Toutes vos conversations sont en pause</string>
   <string name="call_paused_by_remote">Votre correspondant(e) a mis la conversation en pause.</string>
   <string name="zrtp_dialog">Veuillez vérifier par oral avec votre interlocuteur qu\'il a le code suivant :\n%s</string>
+
+  <!-- Status Bar -->
+  <string name="status_connected">Enregistré</string>
+  <string name="status_not_connected">Non enregistré</string>
+  <string name="status_in_progress">Enregistrement en cours</string>
+  <string name="status_error">Enregistrement échoué</string>
+
 </resources>
diff --git a/res/values/custom.xml b/res/values/custom.xml
index 9bc7f7793..a6dd8464a 100644
--- a/res/values/custom.xml
+++ b/res/values/custom.xml
@@ -17,7 +17,7 @@
 	<string name="wait_dialog_text">Starting up</string>
 	<string name="notification_registered">Registered to %s </string>
 	<string name="notification_register_failure">Fails to register to %s</string>
-	<string name="about_text">Linphone %s SIP (rfc 3261) compatible phone under GNU Public License V2</string>
+	<string name="about_text">Version %s</string>
 	<string name="about_link">http://www.linphone.org\n\nInstructions\nhttp://www.linphone.org/user-guide.html\n\n© 2015 Belledonne Communications</string>
 	<string name="button_sip_contacts">SIP</string>
 
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index da87a9d8f..acb5e4dff 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<!-- New settings -->
-	<string name="default_domain">sip.linphone.org</string>
+	<string name="default_domain">sip.orangecyberdefense.com</string>
 	<string name="default_stun">stun.linphone.org</string>
 	<bool name="assistant_use_linphone_login_as_first_fragment">false</bool>
 	<bool name="hide_in_call_stats">false</bool>
@@ -22,7 +22,7 @@
 	<bool name="hide_linphone_accounts_wizard">false</bool>
 	<bool name="hide_generic_accounts_wizard">false</bool>
 	<bool name="hide_remote_provisioning_in_wizard">false</bool>
-	<bool name="allow_cancel_remote_provisioning_login_activity">true</bool>
+	<bool name="allow_cancel_remote_provisioning_login_activity">false</bool>
 	<bool name="hide_accounts">false</bool>
 	<bool name="display_account_wizard_at_first_start">true</bool>
 	<bool name="use_linphone_server_ports">true</bool>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fbb6729b0..ee405b18b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,6 +17,7 @@
 	<string name="deny">Deny</string>
 	<string name="no_account">No account configured</string>
 	<string name="search">Search</string>
+	<string name="download">Download</string>
 	<string name="address_sip">Address Sip</string>
 	<string name="outgoing">outgoing</string>
 	<string name="incoming">incoming</string>
@@ -61,6 +62,7 @@
 	<string name="no_sip_contact">No SIP contact in your address book.</string>
 	<string name="delete_contacts">Do you want to delete selected contact?</string>
 	<string name="delete_contact">Do you want to delete selected this contact?</string>
+	<string name="search_contact">Search</string>
 
 	<!-- 4. Chat -->
 	<string name="no_chat_history">No conversations</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a7596cc81..2b0213f9b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -11,7 +11,7 @@
 
 	<style name="font2" parent="@android:style/TextAppearance.Medium">
 		<item name="android:textColor">@color/colorC</item>
-		<item name="android:textSize">20sp</item>
+		<item name="android:textSize">18sp</item>
 	</style>
 
 	<style name="font3" parent="@android:style/TextAppearance.Small">
@@ -43,7 +43,7 @@
 
 	<style name="font8" parent="@android:style/TextAppearance.Medium">
 		<item name="android:textColor">@color/colorG</item>
-		<item name="android:textSize">24sp</item>
+		<item name="android:textSize">22sp</item>
 	</style>
 
 	<style name="font9" parent="@android:style/TextAppearance.Medium">
@@ -69,7 +69,7 @@
 	<style name="font13" parent="@android:style/TextAppearance.Medium">
 		<item name="android:textColor">@color/colorK</item>
 		<item name="android:textStyle">bold</item>
-		<item name="android:textSize">34sp</item>
+		<item name="android:textSize">30sp</item>
 	</style>
 
 	<style name="font14" parent="@android:style/TextAppearance.Small">
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index 26ac4fac8..ef9231eff 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -156,7 +156,7 @@ public final class LinphoneService extends Service {
 		} catch (Exception e) {
 		}
 
-		mNotif = Compatibility.createNotification(this, mNotificationTitle, "", R.drawable.status_level, R.drawable.linphone_logo, bm, mNotifContentIntent, true,notifcationsPriority);
+		mNotif = Compatibility.createNotification(this, mNotificationTitle, "", R.drawable.status_level, 0, bm, mNotifContentIntent, true,notifcationsPriority);
 
 
 		LinphoneManager.createAndStart(LinphoneService.this);