diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerQueueFragment.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerQueueFragment.java
index 5023407a..b2b13d90 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerQueueFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerQueueFragment.java
@@ -23,7 +23,6 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.cappielloantonio.tempo.databinding.InnerFragmentPlayerQueueBinding;
 import com.cappielloantonio.tempo.interfaces.ClickCallback;
-import com.cappielloantonio.tempo.model.Download;
 import com.cappielloantonio.tempo.service.DownloaderManager;
 import com.cappielloantonio.tempo.service.MediaManager;
 import com.cappielloantonio.tempo.service.MediaService;
@@ -107,8 +106,6 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
     public void onStart() {
         super.onStart();
         initializeBrowser();
-        bindMediaController();
-
         MediaManager.registerPlaybackObserver(mediaBrowserListenableFuture, playbackViewModel);
         observePlayback();
     }
@@ -150,16 +147,6 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
         MediaBrowser.releaseFuture(mediaBrowserListenableFuture);
     }
 
-    private void bindMediaController() {
-        mediaBrowserListenableFuture.addListener(() -> {
-            try {
-                MediaBrowser mediaBrowser = mediaBrowserListenableFuture.get();
-            } catch (Exception exception) {
-                exception.printStackTrace();
-            }
-        }, MoreExecutors.directExecutor());
-    }
-
     private void setMediaBrowserListenableFuture() {
         playerSongQueueAdapter.setMediaBrowserListenableFuture(mediaBrowserListenableFuture);
     }
@@ -261,17 +248,16 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
                 closeFab(fabLoadQueue, 4);
             }
             closeFab(fabSaveToPlaylist, 3); 
-            closeFab(fabDownloadAll, 2);
-            
-            closeFab(fabClearQueue, 1);
+            closeFab(fabClearQueue, 2);
+            closeFab(fabDownloadAll, 1);
             closeFab(fabShuffleQueue, 0);
             
             fabMenuToggle.animate().rotation(0f).setDuration(ANIMATION_DURATION).start();
         } else {
             // OPEN MENU (lowest index at bottom)
-            openFab(fabShuffleQueue, 0); 
-            openFab(fabClearQueue, 1);
-            openFab(fabDownloadAll, 2);
+            openFab(fabShuffleQueue, 0);
+            openFab(fabDownloadAll, 1);
+            openFab(fabClearQueue, 2);
             openFab(fabSaveToPlaylist, 3);
             if (Preferences.isSyncronizationEnabled()) {
                 openFab(fabLoadQueue, 4);
diff --git a/app/src/main/res/layout/inner_fragment_player_queue.xml b/app/src/main/res/layout/inner_fragment_player_queue.xml
index 9490579b..3ddd112b 100644
--- a/app/src/main/res/layout/inner_fragment_player_queue.xml
+++ b/app/src/main/res/layout/inner_fragment_player_queue.xml
@@ -38,6 +38,15 @@
             android:text="@string/player_queue_save_to_playlist"
             app:icon="@android:drawable/ic_menu_edit" />
 
+        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+            android:id="@+id/fab_clear_queue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:visibility="gone"
+            android:text="@string/player_queue_clean_all_button"
+            app:icon="@android:drawable/ic_menu_delete" />
+
         <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
             android:id="@+id/fab_download_all"
             android:layout_width="wrap_content"
@@ -47,7 +56,6 @@
             android:text="@string/menu_download_all_button"
             app:icon="@android:drawable/stat_sys_download_done" />
 
-
         <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
             android:id="@+id/fab_load_queue"
             android:layout_width="wrap_content"
@@ -57,15 +65,6 @@
             android:text="@string/player_queue_load_queue"
             app:icon="@android:drawable/ic_menu_revert" />
 
-        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-            android:id="@+id/fab_clear_queue"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
-            android:visibility="gone"
-            android:text="@string/player_queue_clean_all_button"
-            app:icon="@android:drawable/ic_menu_delete" />
-
         <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
             android:id="@+id/fab_shuffle_queue"
             android:layout_width="wrap_content"