diff --git a/res/drawable-xhdpi/back_white.png b/res/drawable-xhdpi/back_white.png
new file mode 100644
index 000000000..5c88641fa
Binary files /dev/null and b/res/drawable-xhdpi/back_white.png differ
diff --git a/res/layout/about.xml b/res/layout/about.xml
index e02985c07..57a34f5e6 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -36,8 +36,7 @@
             android:layout_height="match_parent"
             android:layout_weight="0.2"
             android:contentDescription="@string/content_description_edit"
-            android:padding="10dp"
-            android:src="@drawable/footer_contacts"/>
+            android:src="@drawable/back_white"/>
     </LinearLayout>
 
     <LinearLayout
diff --git a/res/layout/chat_bubble.xml b/res/layout/chat_bubble.xml
index 3633234f2..792fbc350 100644
--- a/res/layout/chat_bubble.xml
+++ b/res/layout/chat_bubble.xml
@@ -112,13 +112,8 @@
                     android:textColor="#595959"
                     android:textSize="13.3sp"
                     android:textStyle="bold"/>
-				<LinearLayout
-					android:id="@+id/separator"
-					android:layout_width="100dp"
-					android:layout_height="10dp"
-					android:orientation="horizontal"/>
 
-                <RelativeLayout
+				<RelativeLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content">
 
diff --git a/src/android/org/linphone/activities/LinphoneActivity.java b/src/android/org/linphone/activities/LinphoneActivity.java
index 45dc55765..ffae707ce 100644
--- a/src/android/org/linphone/activities/LinphoneActivity.java
+++ b/src/android/org/linphone/activities/LinphoneActivity.java
@@ -184,17 +184,6 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 		//This must be done before calling super.onCreate().
 		super.onCreate(savedInstanceState);
 
-		//Obiane specifics
-		//HTTP to HTTPS migration
-		try {
-			if (LinphonePreferences.instance().getRemoteProvisioningUrl() != null
-					&& LinphonePreferences.instance().getRemoteProvisioningUrl().startsWith("http://")) {
-				LinphonePreferences.instance().setRemoteProvisioningUrl(LinphonePreferences.instance().getRemoteProvisioningUrl().replace("http://", "https://"));
-			}
-		}catch(NullPointerException nPE){
-			Log.e(nPE);
-		}
-
         if (getResources().getBoolean(R.bool.orientation_portrait_only)) {
         	setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
         }
@@ -239,7 +228,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 
 		currentFragment = FragmentsAvailable.EMPTY;
 		if (savedInstanceState == null) {
-			displayContacts(false);
+			goToChatList();
 		} else {
 			currentFragment = (FragmentsAvailable) savedInstanceState.getSerializable("currentFragment");
 		}
diff --git a/src/android/org/linphone/fragments/AboutFragment.java b/src/android/org/linphone/fragments/AboutFragment.java
index ea38fbc0a..ac4f8af65 100644
--- a/src/android/org/linphone/fragments/AboutFragment.java
+++ b/src/android/org/linphone/fragments/AboutFragment.java
@@ -167,7 +167,7 @@ public class AboutFragment extends Fragment implements OnClickListener {
 					lc.resetLogCollection();
 				}
 			} else */if (v == cancel) {
-				LinphoneActivity.instance().displayContacts(false);
+				LinphoneActivity.instance().popBackStack();
 			}
 		}
 	}
diff --git a/submodules/bctoolbox b/submodules/bctoolbox
index 8d3a01637..405da744b 160000
--- a/submodules/bctoolbox
+++ b/submodules/bctoolbox
@@ -1 +1 @@
-Subproject commit 8d3a016378aedcc14438ac55d5549faf79a7325b
+Subproject commit 405da744b62e299d4324988de7bcdbf9779b21ac
diff --git a/submodules/linphone b/submodules/linphone
index 5c01b8868..6edf43c37 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 5c01b88682ce3bd483ba071424cd9384839e9c13
+Subproject commit 6edf43c37dfc4e2c4d785fd4068748a158a4b264