diff --git a/src/ClementineRemote.cpp b/src/ClementineRemote.cpp
index a52f3c4..9546e01 100644
--- a/src/ClementineRemote.cpp
+++ b/src/ClementineRemote.cpp
@@ -40,7 +40,7 @@
 #endif
 
 const QString ClementineRemote::sAppName    = QStringLiteral("ClemRemote");
-const QString ClementineRemote::sVersion    = "1.0-rc1";
+const QString ClementineRemote::sVersion    = "1.0-rc2";
 const QString ClementineRemote::sAppTitle   = tr("Clementine Remote");
 const QString ClementineRemote::sProjectUrl = QStringLiteral("https://github.com/mbruel/ClementineRemote");
 const QString ClementineRemote::sBTCaddress = QStringLiteral("3BGbnvnnBCCqrGuq1ytRqUMciAyMXjXAv6");
diff --git a/src/qml/Playlist.qml b/src/qml/Playlist.qml
index e3c30ad..3238c35 100644
--- a/src/qml/Playlist.qml
+++ b/src/qml/Playlist.qml
@@ -212,73 +212,73 @@ Rectangle {
 
 
     ImageButton {
-        id:   addToOtherPlaylistButton
+        id:   exitSelectModeButton
         size: buttonSize
         anchors {
             bottom: parent.bottom
-            right:  downSelectedSongsButton.left
-            rightMargin: headerSpacing
+            right:  selectAllButton.left
+            rightMargin: headerSpacing/2
         }
-        source: "icons/addToPlayList.png";
+        source: 'icons/' + cppRemote.iconClick();
         onClicked: {
-            if (!mainApp.checkClementineVersion())
-                return
-            if (!cppRemote.appendSongsToOtherPlaylist())
-                mainApp.error(qsTr("No track selected"), qsTr("Please select at least one Track"));
+            cppRemote.selectAllSongsFromProxyModel(false);
+            selectionMode = false;
         }
         visible: selectionMode
-    } // addToOtherPlaylistButton
+    } // exitSelectModeButton
     ImageButton {
-        id:   downSelectedSongsButton
+        id:   selectAllButton
         size: buttonSize
         anchors {
             bottom: parent.bottom
-            right:  exitSelectModeButton.left
-            rightMargin: headerSpacing
+            right:  addToOtherPlaylistButton.left
+            rightMargin: 2*headerSpacing
         }
-        source: "icons/nav_downloads.png";
+        source: "icons/select_all.png";
         onClicked: {
-            if (!mainApp.checkClementineVersion())
-                return
-            if (mainApp.downloadPossible())
-                cppRemote.downloadSelectedSongs();
-            cppRemote.selectAllSongsFromProxyModel(false);
-            selectionMode = false;
+            let allSelected = cppRemote.allSongsSelected();
+            cppRemote.selectAllSongsFromProxyModel(!allSelected);
+            if (allSelected)
+                songsView.currentIndex = -1;
         }
         visible: selectionMode
-    } // downSelectedSongsButton
+    } // selectAllButton
     ImageButton {
-        id:   exitSelectModeButton
+        id:   addToOtherPlaylistButton
         size: buttonSize
         anchors {
             bottom: parent.bottom
-            right:  selectAllButton.left
+            right:  downSelectedSongsButton.left
             rightMargin: headerSpacing
         }
-        source: 'icons/' + cppRemote.iconClick();
+        source: "icons/addToPlayList.png";
         onClicked: {
-            cppRemote.selectAllSongsFromProxyModel(false);
-            selectionMode = false;
+            if (!mainApp.checkClementineVersion())
+                return
+            if (!cppRemote.appendSongsToOtherPlaylist())
+                mainApp.error(qsTr("No track selected"), qsTr("Please select at least one Track"));
         }
         visible: selectionMode
-    } // exitSelectModeButton
+    } // addToOtherPlaylistButton
     ImageButton {
-        id:   selectAllButton
+        id:   downSelectedSongsButton
         size: buttonSize
         anchors {
             bottom: parent.bottom
             right:  deleteSongsButton.left
-            rightMargin: headerSpacing
+            rightMargin: 2*headerSpacing
         }
-        source: "icons/select_all.png";
+        source: "icons/nav_downloads.png";
         onClicked: {
-            let allSelected = cppRemote.allSongsSelected();
-            cppRemote.selectAllSongsFromProxyModel(!allSelected);
-            if (allSelected)
-                songsView.currentIndex = -1;
+            if (!mainApp.checkClementineVersion())
+                return
+            if (mainApp.downloadPossible())
+                cppRemote.downloadSelectedSongs();
+            cppRemote.selectAllSongsFromProxyModel(false);
+            selectionMode = false;
         }
         visible: selectionMode
-    } // selectAllButton
+    } // downSelectedSongsButton
     ImageButton {
         id: deleteSongsButton
         size  : buttonSize