diff --git a/app/build.gradle b/app/build.gradle
index 659244dc2..9038632a2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,7 +43,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.0'
     implementation 'org.jsoup:jsoup:1.10.3'
     implementation 'de.hdodenhof:circleimageview:2.2.0'
-    implementation 'com.github.stom79:country-picker-android:1.2.0-beta-1'
+    implementation 'com.github.stom79:country-picker-android:1.2.0'
     safetynetImplementation 'com.google.android.gms:play-services-safetynet:11.4.2'
     safetynetImplementation 'io.github.kobakei:ratethisapp:1.2.0'
 }
diff --git a/app/app-fdroid-release-1.4.9-beta-4.apk b/app/fdroid/release/app-fdroid-release-1.4.9-beta-4.apk
similarity index 100%
rename from app/app-fdroid-release-1.4.9-beta-4.apk
rename to app/fdroid/release/app-fdroid-release-1.4.9-beta-4.apk
diff --git a/app/app-fdroid-release-1.4.9-beta-6.apk b/app/fdroid/release/app-fdroid-release-1.4.9-beta-6.apk
similarity index 100%
rename from app/app-fdroid-release-1.4.9-beta-6.apk
rename to app/fdroid/release/app-fdroid-release-1.4.9-beta-6.apk
diff --git a/app/app-fdroid-release-1.4.9-beta-7.apk b/app/fdroid/release/app-fdroid-release-1.4.9-beta-7.apk
similarity index 100%
rename from app/app-fdroid-release-1.4.9-beta-7.apk
rename to app/fdroid/release/app-fdroid-release-1.4.9-beta-7.apk
diff --git a/app/app-fdroid-release-1.4.9-rc-1.apk b/app/fdroid/release/app-fdroid-release-1.4.9-rc-1.apk
similarity index 100%
rename from app/app-fdroid-release-1.4.9-rc-1.apk
rename to app/fdroid/release/app-fdroid-release-1.4.9-rc-1.apk
diff --git a/app/app-fdroid-release-1.5.0.apk b/app/fdroid/release/app-fdroid-release-1.5.0.apk
similarity index 100%
rename from app/app-fdroid-release-1.5.0.apk
rename to app/fdroid/release/app-fdroid-release-1.5.0.apk
diff --git a/app/app-fdroid-release-federatedtm-stream.apk b/app/fdroid/release/app-fdroid-release-federatedtm-stream.apk
similarity index 100%
rename from app/app-fdroid-release-federatedtm-stream.apk
rename to app/fdroid/release/app-fdroid-release-federatedtm-stream.apk
diff --git a/app/mastodon-etalab-v1.0.1.apk b/app/old/releases/mastodon-etalab-v1.0.1.apk
similarity index 100%
rename from app/mastodon-etalab-v1.0.1.apk
rename to app/old/releases/mastodon-etalab-v1.0.1.apk
diff --git a/app/mastodon-etalab-v1.0.2.apk b/app/old/releases/mastodon-etalab-v1.0.2.apk
similarity index 100%
rename from app/mastodon-etalab-v1.0.2.apk
rename to app/old/releases/mastodon-etalab-v1.0.2.apk
diff --git a/app/mastodon-etalab-v1.0.3.apk b/app/old/releases/mastodon-etalab-v1.0.3.apk
similarity index 100%
rename from app/mastodon-etalab-v1.0.3.apk
rename to app/old/releases/mastodon-etalab-v1.0.3.apk
diff --git a/app/mastodon-etalab-v1.0.4.apk b/app/old/releases/mastodon-etalab-v1.0.4.apk
similarity index 100%
rename from app/mastodon-etalab-v1.0.4.apk
rename to app/old/releases/mastodon-etalab-v1.0.4.apk
diff --git a/app/mastodon-etalab-v1.0.5.apk b/app/old/releases/mastodon-etalab-v1.0.5.apk
similarity index 100%
rename from app/mastodon-etalab-v1.0.5.apk
rename to app/old/releases/mastodon-etalab-v1.0.5.apk
diff --git a/app/mastodon-etalab-v1.0.apk b/app/old/releases/mastodon-etalab-v1.0.apk
similarity index 100%
rename from app/mastodon-etalab-v1.0.apk
rename to app/old/releases/mastodon-etalab-v1.0.apk
diff --git a/app/mastodon-etalab-v1.1.0.apk b/app/old/releases/mastodon-etalab-v1.1.0.apk
similarity index 100%
rename from app/mastodon-etalab-v1.1.0.apk
rename to app/old/releases/mastodon-etalab-v1.1.0.apk
diff --git a/app/mastodon-etalab-v1.1.1.apk b/app/old/releases/mastodon-etalab-v1.1.1.apk
similarity index 100%
rename from app/mastodon-etalab-v1.1.1.apk
rename to app/old/releases/mastodon-etalab-v1.1.1.apk
diff --git a/app/mastodon-etalab-v1.1.2.1.apk b/app/old/releases/mastodon-etalab-v1.1.2.1.apk
similarity index 100%
rename from app/mastodon-etalab-v1.1.2.1.apk
rename to app/old/releases/mastodon-etalab-v1.1.2.1.apk
diff --git a/app/mastodon-etalab-v1.1.2.apk b/app/old/releases/mastodon-etalab-v1.1.2.apk
similarity index 100%
rename from app/mastodon-etalab-v1.1.2.apk
rename to app/old/releases/mastodon-etalab-v1.1.2.apk
diff --git a/app/mastodon-etalab-v1.1.3.apk b/app/old/releases/mastodon-etalab-v1.1.3.apk
similarity index 100%
rename from app/mastodon-etalab-v1.1.3.apk
rename to app/old/releases/mastodon-etalab-v1.1.3.apk
diff --git a/app/mastodon-etalab-v1.1.4.apk b/app/old/releases/mastodon-etalab-v1.1.4.apk
similarity index 100%
rename from app/mastodon-etalab-v1.1.4.apk
rename to app/old/releases/mastodon-etalab-v1.1.4.apk
diff --git a/app/mastodon-etalab-v1.1.5.apk b/app/old/releases/mastodon-etalab-v1.1.5.apk
similarity index 100%
rename from app/mastodon-etalab-v1.1.5.apk
rename to app/old/releases/mastodon-etalab-v1.1.5.apk
diff --git a/app/mastodon-etalab-v1.1.6.apk b/app/old/releases/mastodon-etalab-v1.1.6.apk
similarity index 100%
rename from app/mastodon-etalab-v1.1.6.apk
rename to app/old/releases/mastodon-etalab-v1.1.6.apk
diff --git a/app/mastodon-etalab-v1.1.7.apk b/app/old/releases/mastodon-etalab-v1.1.7.apk
similarity index 100%
rename from app/mastodon-etalab-v1.1.7.apk
rename to app/old/releases/mastodon-etalab-v1.1.7.apk
diff --git a/app/mastodon-etalab-v1.1.8.apk b/app/old/releases/mastodon-etalab-v1.1.8.apk
similarity index 100%
rename from app/mastodon-etalab-v1.1.8.apk
rename to app/old/releases/mastodon-etalab-v1.1.8.apk
diff --git a/app/mastodon-etalab-v1.1.9.apk b/app/old/releases/mastodon-etalab-v1.1.9.apk
similarity index 100%
rename from app/mastodon-etalab-v1.1.9.apk
rename to app/old/releases/mastodon-etalab-v1.1.9.apk
diff --git a/app/mastodon-etalab-v1.2.0.apk b/app/old/releases/mastodon-etalab-v1.2.0.apk
similarity index 100%
rename from app/mastodon-etalab-v1.2.0.apk
rename to app/old/releases/mastodon-etalab-v1.2.0.apk
diff --git a/app/mastodon-etalab-v1.2.1.apk b/app/old/releases/mastodon-etalab-v1.2.1.apk
similarity index 100%
rename from app/mastodon-etalab-v1.2.1.apk
rename to app/old/releases/mastodon-etalab-v1.2.1.apk
diff --git a/app/mastodon-etalab-v1.2.2.apk b/app/old/releases/mastodon-etalab-v1.2.2.apk
similarity index 100%
rename from app/mastodon-etalab-v1.2.2.apk
rename to app/old/releases/mastodon-etalab-v1.2.2.apk
diff --git a/app/mastodon-etalab-v1.2.3.apk b/app/old/releases/mastodon-etalab-v1.2.3.apk
similarity index 100%
rename from app/mastodon-etalab-v1.2.3.apk
rename to app/old/releases/mastodon-etalab-v1.2.3.apk
diff --git a/app/mastodon-etalab-v1.2.4.apk b/app/old/releases/mastodon-etalab-v1.2.4.apk
similarity index 100%
rename from app/mastodon-etalab-v1.2.4.apk
rename to app/old/releases/mastodon-etalab-v1.2.4.apk
diff --git a/app/mastodon-etalab-v1.2.5.apk b/app/old/releases/mastodon-etalab-v1.2.5.apk
similarity index 100%
rename from app/mastodon-etalab-v1.2.5.apk
rename to app/old/releases/mastodon-etalab-v1.2.5.apk
diff --git a/app/mastodon-etalab-v1.2.6.apk b/app/old/releases/mastodon-etalab-v1.2.6.apk
similarity index 100%
rename from app/mastodon-etalab-v1.2.6.apk
rename to app/old/releases/mastodon-etalab-v1.2.6.apk
diff --git a/app/mastodon-etalab-v1.2.7.apk b/app/old/releases/mastodon-etalab-v1.2.7.apk
similarity index 100%
rename from app/mastodon-etalab-v1.2.7.apk
rename to app/old/releases/mastodon-etalab-v1.2.7.apk
diff --git a/app/mastodon-etalab-v1.2.8.apk b/app/old/releases/mastodon-etalab-v1.2.8.apk
similarity index 100%
rename from app/mastodon-etalab-v1.2.8.apk
rename to app/old/releases/mastodon-etalab-v1.2.8.apk
diff --git a/app/mastodon-etalab-v1.2.9.apk b/app/old/releases/mastodon-etalab-v1.2.9.apk
similarity index 100%
rename from app/mastodon-etalab-v1.2.9.apk
rename to app/old/releases/mastodon-etalab-v1.2.9.apk
diff --git a/app/mastodon-etalab-v1.3.0.apk b/app/old/releases/mastodon-etalab-v1.3.0.apk
similarity index 100%
rename from app/mastodon-etalab-v1.3.0.apk
rename to app/old/releases/mastodon-etalab-v1.3.0.apk
diff --git a/app/mastodon-etalab-v1.3.1.apk b/app/old/releases/mastodon-etalab-v1.3.1.apk
similarity index 100%
rename from app/mastodon-etalab-v1.3.1.apk
rename to app/old/releases/mastodon-etalab-v1.3.1.apk
diff --git a/app/mastodon-etalab-v1.3.2.apk b/app/old/releases/mastodon-etalab-v1.3.2.apk
similarity index 100%
rename from app/mastodon-etalab-v1.3.2.apk
rename to app/old/releases/mastodon-etalab-v1.3.2.apk
diff --git a/app/mastodon-etalab-v1.3.3.apk b/app/old/releases/mastodon-etalab-v1.3.3.apk
similarity index 100%
rename from app/mastodon-etalab-v1.3.3.apk
rename to app/old/releases/mastodon-etalab-v1.3.3.apk
diff --git a/app/mastodon-etalab-v1.3.4.apk b/app/old/releases/mastodon-etalab-v1.3.4.apk
similarity index 100%
rename from app/mastodon-etalab-v1.3.4.apk
rename to app/old/releases/mastodon-etalab-v1.3.4.apk
diff --git a/app/mastodon-etalab-v1.3.5.apk b/app/old/releases/mastodon-etalab-v1.3.5.apk
similarity index 100%
rename from app/mastodon-etalab-v1.3.5.apk
rename to app/old/releases/mastodon-etalab-v1.3.5.apk
diff --git a/app/mastodon-etalab-v1.3.6.apk b/app/old/releases/mastodon-etalab-v1.3.6.apk
similarity index 100%
rename from app/mastodon-etalab-v1.3.6.apk
rename to app/old/releases/mastodon-etalab-v1.3.6.apk
diff --git a/app/mastodon-etalab-v1.3.7.apk b/app/old/releases/mastodon-etalab-v1.3.7.apk
similarity index 100%
rename from app/mastodon-etalab-v1.3.7.apk
rename to app/old/releases/mastodon-etalab-v1.3.7.apk
diff --git a/app/mastodon-etalab-v1.3.8.apk b/app/old/releases/mastodon-etalab-v1.3.8.apk
similarity index 100%
rename from app/mastodon-etalab-v1.3.8.apk
rename to app/old/releases/mastodon-etalab-v1.3.8.apk
diff --git a/app/mastodon-etalab-v1.3.9.1.apk b/app/old/releases/mastodon-etalab-v1.3.9.1.apk
similarity index 100%
rename from app/mastodon-etalab-v1.3.9.1.apk
rename to app/old/releases/mastodon-etalab-v1.3.9.1.apk
diff --git a/app/mastodon-etalab-v1.3.9.apk b/app/old/releases/mastodon-etalab-v1.3.9.apk
similarity index 100%
rename from app/mastodon-etalab-v1.3.9.apk
rename to app/old/releases/mastodon-etalab-v1.3.9.apk
diff --git a/app/mastodon-etalab-v1.4.0.apk b/app/old/releases/mastodon-etalab-v1.4.0.apk
similarity index 100%
rename from app/mastodon-etalab-v1.4.0.apk
rename to app/old/releases/mastodon-etalab-v1.4.0.apk
diff --git a/app/mastodon-etalab-v1.4.1.apk b/app/old/releases/mastodon-etalab-v1.4.1.apk
similarity index 100%
rename from app/mastodon-etalab-v1.4.1.apk
rename to app/old/releases/mastodon-etalab-v1.4.1.apk
diff --git a/app/mastodon-etalab-v1.4.2.apk b/app/old/releases/mastodon-etalab-v1.4.2.apk
similarity index 100%
rename from app/mastodon-etalab-v1.4.2.apk
rename to app/old/releases/mastodon-etalab-v1.4.2.apk
diff --git a/app/mastodon-etalab-v1.4.3.apk b/app/old/releases/mastodon-etalab-v1.4.3.apk
similarity index 100%
rename from app/mastodon-etalab-v1.4.3.apk
rename to app/old/releases/mastodon-etalab-v1.4.3.apk
diff --git a/app/mastodon-etalab-v1.4.4.apk b/app/old/releases/mastodon-etalab-v1.4.4.apk
similarity index 100%
rename from app/mastodon-etalab-v1.4.4.apk
rename to app/old/releases/mastodon-etalab-v1.4.4.apk
diff --git a/app/mastodon-etalab-v1.4.5.apk b/app/old/releases/mastodon-etalab-v1.4.5.apk
similarity index 100%
rename from app/mastodon-etalab-v1.4.5.apk
rename to app/old/releases/mastodon-etalab-v1.4.5.apk
diff --git a/app/mastodon-etalab-v1.4.6.apk b/app/old/releases/mastodon-etalab-v1.4.6.apk
similarity index 100%
rename from app/mastodon-etalab-v1.4.6.apk
rename to app/old/releases/mastodon-etalab-v1.4.6.apk
diff --git a/app/mastodon-etalab-v1.4.7.apk b/app/old/releases/mastodon-etalab-v1.4.7.apk
similarity index 100%
rename from app/mastodon-etalab-v1.4.7.apk
rename to app/old/releases/mastodon-etalab-v1.4.7.apk
diff --git a/app/app-safetynet-release-1.4.9-beta-6.apk b/app/safetynet/release/app-safetynet-release-1.4.9-beta-6.apk
similarity index 100%
rename from app/app-safetynet-release-1.4.9-beta-6.apk
rename to app/safetynet/release/app-safetynet-release-1.4.9-beta-6.apk
diff --git a/app/app-safetynet-release-1.4.9-beta-7.apk b/app/safetynet/release/app-safetynet-release-1.4.9-beta-7.apk
similarity index 100%
rename from app/app-safetynet-release-1.4.9-beta-7.apk
rename to app/safetynet/release/app-safetynet-release-1.4.9-beta-7.apk
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
index 727444bfa..2c1b20961 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
@@ -74,10 +74,10 @@ import android.widget.TextView;
 import android.widget.TimePicker;
 import android.widget.Toast;
 
+import com.github.stom79.localepicker.CountryPicker;
+import com.github.stom79.localepicker.CountryPickerListener;
 import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.BinaryHttpResponseHandler;
-import com.mukesh.countrypicker.CountryPicker;
-import com.mukesh.countrypicker.CountryPickerListener;
 import com.nostra13.universalimageloader.cache.disc.impl.UnlimitedDiskCache;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
@@ -815,7 +815,7 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
                 picker.setListener(new CountryPickerListener() {
                     @SuppressLint("InflateParams")
                     @Override
-                    public void onSelectCountry(String name, String code, String dialCode, String locale, int flagDrawableResID) {
+                    public void onSelectCountry(String name, String locale, int flagDrawableResID) {
                         picker.dismiss();
                         AlertDialog.Builder transAlert = new AlertDialog.Builder(TootActivity.this);
                         transAlert.setTitle(R.string.translate_toot);