diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f3bcedc9..3f4a866a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,13 +8,13 @@
 
     <application
         android:name="App"
-        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true"
         android:theme="@style/Theme.App.Starting"
-        android:usesCleartextTraffic="true">
+        android:usesCleartextTraffic="true"
+        android:allowBackup="false">
         <activity
             android:name=".ui.activity.MainActivity"
             android:windowSoftInputMode="adjustPan|adjustResize"
diff --git a/app/src/main/java/com/cappielloantonio/play/model/Server.java b/app/src/main/java/com/cappielloantonio/play/model/Server.java
index 281c4a5f..26691b0d 100644
--- a/app/src/main/java/com/cappielloantonio/play/model/Server.java
+++ b/app/src/main/java/com/cappielloantonio/play/model/Server.java
@@ -100,6 +100,25 @@ public class Server implements Parcelable {
         this.timestamp = timestamp;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Server server = (Server) o;
+        return serverId.equals(server.getServerId());
+    }
+
+    @Override
+    public int hashCode() {
+        return serverId.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return serverId;
+    }
+
     @Override
     public int describeContents() {
         return 0;
@@ -125,4 +144,10 @@ public class Server implements Parcelable {
         this.salt = in.readString();
         this.timestamp = in.readLong();
     }
+
+    public static final Creator<Server> CREATOR = new Creator<Server>() {
+        public Server createFromParcel(Parcel in) { return new Server(in); }
+
+        public Server[] newArray(int size) { return new Server[size]; }
+    };
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/model/Song.java b/app/src/main/java/com/cappielloantonio/play/model/Song.java
index 8ee95003..53e758e6 100644
--- a/app/src/main/java/com/cappielloantonio/play/model/Song.java
+++ b/app/src/main/java/com/cappielloantonio/play/model/Song.java
@@ -1,6 +1,5 @@
 package com.cappielloantonio.play.model;
 
-import android.annotation.SuppressLint;
 import android.os.Parcel;
 import android.os.Parcelable;
 
@@ -305,7 +304,6 @@ public class Song implements Parcelable {
         return 0;
     }
 
-    @SuppressLint("NewApi")
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(this.id);
@@ -330,7 +328,6 @@ public class Song implements Parcelable {
         dest.writeLong(this.lastPlay);
     }
 
-    @SuppressLint("NewApi")
     protected Song(Parcel in) {
         this.id = in.readString();
         this.title = in.readString();
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java b/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java
index f4128916..555624a2 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java
@@ -153,6 +153,10 @@ public class MainActivity extends BaseActivity {
                             if (playerBottomSheetFragment != null)
                                 playerBottomSheetFragment.scrollOnTop();
                             break;
+                        case BottomSheetBehavior.STATE_DRAGGING:
+                        case BottomSheetBehavior.STATE_EXPANDED:
+                        case BottomSheetBehavior.STATE_HALF_EXPANDED:
+                            break;
                     }
                 }
 
diff --git a/app/src/main/res/drawable/ic_download_for_offline.xml b/app/src/main/res/drawable/ic_download_for_offline.xml
deleted file mode 100644
index 87e6cd5b..00000000
--- a/app/src/main/res/drawable/ic_download_for_offline.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@color/titleTextColor"
-      android:pathData="M12,2C6.49,2 2,6.49 2,12s4.49,10 10,10s10,-4.49 10,-10S17.51,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8S16.41,20 12,20zM14.59,8.59L16,10l-4,4l-4,-4l1.41,-1.41L11,10.17V6h2v4.17L14.59,8.59zM17,17H7v-2h10V17z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_downloading.xml b/app/src/main/res/drawable/ic_downloading.xml
deleted file mode 100644
index 057c6b99..00000000
--- a/app/src/main/res/drawable/ic_downloading.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/titleTextColor"
-        android:pathData="M18.32,4.26C16.84,3.05 15.01,2.25 13,2.05v2.02c1.46,0.18 2.79,0.76 3.9,1.62L18.32,4.26zM19.93,11h2.02c-0.2,-2.01 -1,-3.84 -2.21,-5.32L18.31,7.1C19.17,8.21 19.75,9.54 19.93,11zM18.31,16.9l1.43,1.43c1.21,-1.48 2.01,-3.32 2.21,-5.32h-2.02C19.75,14.46 19.17,15.79 18.31,16.9zM13,19.93v2.02c2.01,-0.2 3.84,-1 5.32,-2.21l-1.43,-1.43C15.79,19.17 14.46,19.75 13,19.93zM15.59,10.59L13,13.17V7h-2v6.17l-2.59,-2.59L7,12l5,5l5,-5L15.59,10.59zM11,19.93v2.02c-5.05,-0.5 -9,-4.76 -9,-9.95s3.95,-9.45 9,-9.95v2.02C7.05,4.56 4,7.92 4,12S7.05,19.44 11,19.93z" />
-</vector>
diff --git a/build.gradle b/build.gradle
index b33c121a..3ee1e0e7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,6 +2,7 @@
 buildscript {
     repositories {
         google()
+        mavenCentral()
         jcenter()
     }
     dependencies {
@@ -16,13 +17,14 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven {
             url 'https://jitpack.io'
         }
         maven {
             url 'https://oss.sonatype.org/content/repositories/snapshots'
         }
+        jcenter()
     }
 }