diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java
index 2d7413de..63cb018a 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java
@@ -85,7 +85,7 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
             );
             holder.view.setActivated(isChecked(song));
         } else {
-            holder.songTitle.setText(activity.getResources().getString(R.string.shuffle_all).toUpperCase());
+            holder.songTitle.setText(activity.getResources().getString(R.string.action_shuffle_all).toUpperCase());
             holder.songTitle.setTextColor(ThemeSingleton.get().positiveColor);
             holder.songTitle.setTypeface(Typeface.create("sans-serif-medium", Typeface.NORMAL));
             holder.songInfo.setVisibility(View.GONE);
@@ -175,7 +175,7 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
         @Override
         public void onClick(View v) {
             if (getItemViewType() == SHUFFLE_BUTTON) {
-                MusicPlayerRemote.shuffleAllSongs(activity);
+                MusicPlayerRemote.shuffleAllSongs(activity, true);
             } else if (isInQuickSelectMode()) {
                 toggleChecked(getAdapterPosition());
             } else {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/MusicPlayerRemote.java b/app/src/main/java/com/kabouzeid/gramophone/helper/MusicPlayerRemote.java
index 198e6d86..21409172 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/helper/MusicPlayerRemote.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/helper/MusicPlayerRemote.java
@@ -176,11 +176,14 @@ public class MusicPlayerRemote {
         return false;
     }
 
-    public static boolean shuffleAllSongs(final Context context) {
+    public static boolean shuffleAllSongs(final Context context, boolean startPlaying) {
+        return openAndShuffleQueue(context, SongLoader.getAllSongs(context), startPlaying);
+    }
+
+    public static boolean openAndShuffleQueue(final Context context, final ArrayList<Song> songs, boolean startPlaying) {
         if (musicService != null) {
-            ArrayList<Song> songs = SongLoader.getAllSongs(context);
             if (!songs.isEmpty()) {
-                MusicPlayerRemote.openQueue(songs, new Random().nextInt(songs.size()), true);
+                MusicPlayerRemote.openQueue(songs, new Random().nextInt(songs.size()), startPlaying);
                 setShuffleMode(MusicService.SHUFFLE_MODE_SHUFFLE);
             }
             return true;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
index 8986ba28..3495109d 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
@@ -349,8 +349,8 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH
             case R.id.action_equalizer:
                 NavigationUtil.openEqualizer(this);
                 return true;
-            case R.id.action_shuffle_all:
-                MusicPlayerRemote.shuffleAllSongs(this);
+            case R.id.action_shuffle_album:
+                MusicPlayerRemote.openAndShuffleQueue(this, songs, true);
                 return true;
             case android.R.id.home:
                 super.onBackPressed();
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
index b2d30c96..29203c7a 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
@@ -68,7 +68,7 @@ import butterknife.InjectView;
 
 /**
  * A lot of hackery is done in this activity. Changing things may will brake the whole activity.
- * <p/>
+ * <p>
  * Should be kinda stable ONLY AS IT IS!!!
  */
 public class ArtistDetailActivity extends AbsFabActivity implements PaletteColorHolder, CabHolder {
@@ -392,8 +392,8 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor
             case R.id.action_equalizer:
                 NavigationUtil.openEqualizer(this);
                 return true;
-            case R.id.action_shuffle_all:
-                MusicPlayerRemote.shuffleAllSongs(this);
+            case R.id.action_shuffle_artist:
+                MusicPlayerRemote.openAndShuffleQueue(this, songs, true);
                 return true;
             case android.R.id.home:
                 super.onBackPressed();
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
index c0ea88f0..481db105 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
@@ -342,7 +342,7 @@ public class MainActivity extends AbsFabActivity
                 NavigationUtil.openEqualizer(this);
                 return true;
             case R.id.action_shuffle_all:
-                MusicPlayerRemote.shuffleAllSongs(this);
+                MusicPlayerRemote.shuffleAllSongs(this, true);
                 return true;
             case R.id.action_new_playlist:
                 CreatePlaylistDialog.create().show(getSupportFragmentManager(), "CREATE_PLAYLIST");
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java
index 1b10e6cd..a4ddc06b 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java
@@ -571,7 +571,7 @@ public class MusicControllerActivity extends AbsFabActivity {
                 NavigationUtil.openEqualizer(this);
                 return true;
             case R.id.action_shuffle_all:
-                MusicPlayerRemote.shuffleAllSongs(this);
+                MusicPlayerRemote.shuffleAllSongs(this, true);
                 return true;
             case R.id.action_add_to_playlist:
                 AddToPlaylistDialog.create(song).show(getSupportFragmentManager(), "ADD_PLAYLIST");
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java
index adbc861d..6e954c23 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java
@@ -15,12 +15,14 @@ import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.adapter.songadapter.AbsPlaylistSongAdapter;
 import com.kabouzeid.gramophone.adapter.songadapter.PlaylistSongAdapter;
 import com.kabouzeid.gramophone.adapter.songadapter.smartplaylist.SmartPlaylistSongAdapter;
+import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
 import com.kabouzeid.gramophone.interfaces.CabHolder;
 import com.kabouzeid.gramophone.loader.PlaylistSongLoader;
 import com.kabouzeid.gramophone.misc.DragSortRecycler;
 import com.kabouzeid.gramophone.model.DataBaseChangedEvent;
 import com.kabouzeid.gramophone.model.Playlist;
 import com.kabouzeid.gramophone.model.PlaylistSong;
+import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.model.smartplaylist.SmartPlaylist;
 import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity;
 import com.kabouzeid.gramophone.util.NavigationUtil;
@@ -133,6 +135,9 @@ public class PlaylistDetailActivity extends AbsFabActivity implements CabHolder
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
         switch (id) {
+            case R.id.action_shuffle_playlist:
+                MusicPlayerRemote.openAndShuffleQueue(this, new ArrayList<Song>(songs), true);
+                return true;
             case R.id.action_equalizer:
                 NavigationUtil.openEqualizer(this);
                 return true;
diff --git a/app/src/main/res/menu/menu_album_detail.xml b/app/src/main/res/menu/menu_album_detail.xml
index b9ca79bf..3f96a1f5 100644
--- a/app/src/main/res/menu/menu_album_detail.xml
+++ b/app/src/main/res/menu/menu_album_detail.xml
@@ -13,11 +13,11 @@
         android:id="@+id/action_playing_queue"
         android:icon="@drawable/ic_queue_music_white_24dp"
         android:title="@string/action_playing_queue"
-        app:showAsAction="never"/>
+        app:showAsAction="ifRoom" />
 
     <item
-        android:id="@+id/action_shuffle_all"
-        android:title="@string/shuffle_all"
+        android:id="@+id/action_shuffle_album"
+        android:title="@string/action_shuffle_album"
         app:showAsAction="never"/>
 
     <item
diff --git a/app/src/main/res/menu/menu_albums.xml b/app/src/main/res/menu/menu_albums.xml
index 1c3baef4..c25091c0 100644
--- a/app/src/main/res/menu/menu_albums.xml
+++ b/app/src/main/res/menu/menu_albums.xml
@@ -17,7 +17,7 @@
 
     <item
         android:id="@+id/action_shuffle_all"
-        android:title="@string/shuffle_all"
+        android:title="@string/action_shuffle_all"
         app:showAsAction="never" />
 
     <item
diff --git a/app/src/main/res/menu/menu_artist_detail.xml b/app/src/main/res/menu/menu_artist_detail.xml
index 561b17e1..f08122cb 100644
--- a/app/src/main/res/menu/menu_artist_detail.xml
+++ b/app/src/main/res/menu/menu_artist_detail.xml
@@ -13,11 +13,11 @@
         android:id="@+id/action_playing_queue"
         android:icon="@drawable/ic_queue_music_white_24dp"
         android:title="@string/action_playing_queue"
-        app:showAsAction="never"/>
+        app:showAsAction="ifRoom" />
 
     <item
-        android:id="@+id/action_shuffle_all"
-        android:title="@string/shuffle_all"
+        android:id="@+id/action_shuffle_artist"
+        android:title="@string/action_shuffle_artist"
         app:showAsAction="never"/>
 
     <item
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 2dd54564..ff59ce9e 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -17,7 +17,7 @@
 
     <item
         android:id="@+id/action_shuffle_all"
-        android:title="@string/shuffle_all"
+        android:title="@string/action_shuffle_all"
         app:showAsAction="never"/>
 
     <item
diff --git a/app/src/main/res/menu/menu_music_playing.xml b/app/src/main/res/menu/menu_music_playing.xml
index 433d57bd..83c92e17 100644
--- a/app/src/main/res/menu/menu_music_playing.xml
+++ b/app/src/main/res/menu/menu_music_playing.xml
@@ -15,7 +15,7 @@
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/action_shuffle_all"
-        android:title="@string/shuffle_all"
+        android:title="@string/action_shuffle_all"
         app:showAsAction="never" />
     <item
         android:id="@+id/action_add_to_playlist"
diff --git a/app/src/main/res/menu/menu_playlist_detail.xml b/app/src/main/res/menu/menu_playlist_detail.xml
index 2ec62854..aafc15b4 100644
--- a/app/src/main/res/menu/menu_playlist_detail.xml
+++ b/app/src/main/res/menu/menu_playlist_detail.xml
@@ -11,7 +11,13 @@
 
     <item
         android:id="@+id/action_playing_queue"
+        android:icon="@drawable/ic_queue_music_white_24dp"
         android:title="@string/action_playing_queue"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/action_shuffle_playlist"
+        android:title="@string/action_shuffle_playlist"
         app:showAsAction="never" />
 
     <item
diff --git a/app/src/main/res/menu/menu_playlists.xml b/app/src/main/res/menu/menu_playlists.xml
index 67879373..ab16ce61 100644
--- a/app/src/main/res/menu/menu_playlists.xml
+++ b/app/src/main/res/menu/menu_playlists.xml
@@ -20,7 +20,7 @@
 
     <item
         android:id="@+id/action_shuffle_all"
-        android:title="@string/shuffle_all"
+        android:title="@string/action_shuffle_all"
         app:showAsAction="never" />
 
     <item
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index a56ee633..bb6a2ace 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -68,7 +68,7 @@
     <string name="add_playlist_title">"إضافة إلى قائمة التشغيل"</string>
     <string name="new_playlist_title">قائمة تشغيل جديدة</string>
     <string name="delete_warning">"تحذير: لا يمكن التراجع عن هذه العملية."</string>
-    <string name="shuffle_all">عشوائي</string>
+    <string name="action_shuffle_all">عشوائي</string>
     <string name="last_opened">آخر ما تم فتحه</string>
     <string name="light_theme_name">فاتح</string>
     <string name="dark_theme_name">داكن</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 9ef73ed0..0ac81f49 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -86,7 +86,7 @@
     <string name="add_playlist_title">"Přidat do playlistu"</string>
     <string name="new_playlist_title">Nový playlist</string>
     <string name="delete_warning">"Varování: Tato operace nemůže být vrácena"</string>
-    <string name="shuffle_all">Přehrát náhodně</string>
+    <string name="action_shuffle_all">Přehrát náhodně</string>
     <string name="last_opened">Naposledy otevřené</string>
     <string name="light_theme_name">Světlý</string>
     <string name="dark_theme_name">Tmavý</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 21dc47aa..9a0fab87 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -86,7 +86,7 @@
     <string name="add_playlist_title">"Zu Wiedergabeliste hinzufügen"</string>
     <string name="new_playlist_title">Neue Wiedergabeliste</string>
     <string name="delete_warning">"Warnung: Diese Aktion kann nicht rückgängig gemahct werden."</string>
-    <string name="shuffle_all">Zufällige Wiedergabe</string>
+    <string name="action_shuffle_all">Zufällige Wiedergabe</string>
     <string name="last_opened">Zuletzt geöffnet</string>
     <string name="light_theme_name">Hell</string>
     <string name="dark_theme_name">Dunkel</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index e6df3fa4..f5590399 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -69,7 +69,7 @@
     <string name="add_playlist_title">"Προσθήκη στη λίστα αναπαραγωγής"</string>
     <string name="new_playlist_title">Νέα λίστα αναπαραγωγής</string>
     <string name="delete_warning">"Προσοχή: Αυτή η ενέργεια δε μπορεί να αναιρεθεί."</string>
-    <string name="shuffle_all">Αναδιάταξη όλων</string>
+    <string name="action_shuffle_all">Αναδιάταξη όλων</string>
     <string name="last_opened">Τελευταίο άνοιγμα</string>
     <string name="light_theme_name">Ανοιχτό</string>
     <string name="dark_theme_name">Σκούρο</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 7da01c01..d0965162 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -88,7 +88,7 @@
     <string name="add_playlist_title">"Agregar a la lista de reproducción"</string>
     <string name="new_playlist_title">Nueva lista de reproducción</string>
     <string name="delete_warning">"Advertencia: Esta operación no se puede deshacer"</string>
-    <string name="shuffle_all">Aleatorio</string>
+    <string name="action_shuffle_all">Aleatorio</string>
     <string name="last_opened">Última abierta</string>
     <string name="light_theme_name">Claro</string>
     <string name="dark_theme_name">Oscuro</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 3741f290..db6bff38 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -65,7 +65,7 @@
     <string name="add_playlist_title">"Lisää Soittolistaan"</string>
     <string name="new_playlist_title">Uusi Soittolista</string>
     <string name="delete_warning">"Varoitus: Tätä toimintoa ei voida perua."</string>
-    <string name="shuffle_all">Sekoita kaikki</string>
+    <string name="action_shuffle_all">Sekoita kaikki</string>
     <string name="last_opened">Viimeksi avattu</string>
     <string name="light_theme_name">Vaalea</string>
     <string name="dark_theme_name">Tumma</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index f901ba90..e1930874 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -86,7 +86,7 @@
     <string name="add_playlist_title">"Ajouter à la playlist"</string>
     <string name="new_playlist_title">Nouvelle playlist</string>
     <string name="delete_warning">"Attention : Cette action ne peut être annulée"</string>
-    <string name="shuffle_all">Aléatoire</string>
+    <string name="action_shuffle_all">Aléatoire</string>
     <string name="last_opened">Récemment ouverts</string>
     <string name="light_theme_name">Clair</string>
     <string name="dark_theme_name">Sombre</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 3b8f3a89..5be848a3 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -86,7 +86,7 @@
     <string name="add_playlist_title">"Dodaj na popis pjesama"</string>
     <string name="new_playlist_title">Novi popis pjesama</string>
     <string name="delete_warning">"Upozorenje: Ovaj postupak nije moguće poništiti."</string>
-    <string name="shuffle_all">Nasumična reprodukcija</string>
+    <string name="action_shuffle_all">Nasumična reprodukcija</string>
     <string name="last_opened">Posljednje otvoreno</string>
     <string name="light_theme_name">Svijetla</string>
     <string name="dark_theme_name">Tamna</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 25d7cba9..cfd6c06a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -86,7 +86,7 @@
     <string name="add_playlist_title">"Aggiungi alla playlist"</string>
     <string name="new_playlist_title">Nuova playlist</string>
     <string name="delete_warning">"Attenzione: questa operazione non può essere annullata."</string>
-    <string name="shuffle_all">Casuale</string>
+    <string name="action_shuffle_all">Casuale</string>
     <string name="last_opened">Ultima aperta</string>
     <string name="light_theme_name">Chiaro</string>
     <string name="dark_theme_name">Scuro</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index a9b47f12..4b33521e 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -86,7 +86,7 @@
     <string name="add_playlist_title">"재생목록에 추가"</string>
     <string name="new_playlist_title">새로운 재생목록</string>
     <string name="delete_warning">"경고 : 이 작업은 되돌릴 수 없습니다."</string>
-    <string name="shuffle_all">모든 노래 임의 재생</string>
+    <string name="action_shuffle_all">모든 노래 임의 재생</string>
     <string name="last_opened">마지막으로 열었던 위치</string>
     <string name="light_theme_name">밝은 테마</string>
     <string name="dark_theme_name">어두운 테마</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 84b205ab..10a8e96f 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -86,7 +86,7 @@
     <string name="add_playlist_title">"Toevoegen aan afspeellijst"</string>
     <string name="new_playlist_title">Nieuwe afspeellijst</string>
     <string name="delete_warning">"Waarschuwing: Deze handeling kan niet ongedaan gemaakt worden."</string>
-    <string name="shuffle_all">Shuffle alles</string>
+    <string name="action_shuffle_all">Shuffle alles</string>
     <string name="last_opened">Laatst geopend</string>
     <string name="light_theme_name">Licht</string>
     <string name="dark_theme_name">Donker</string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index a9f8760d..ef7e47eb 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -75,7 +75,7 @@
     <string name="add_playlist_title">"Legg til i speleliste"</string>
     <string name="new_playlist_title">Ny speleliste</string>
     <string name="delete_warning">"Åtvaring: Denne operasjonen kan ikkje gjerast om."</string>
-    <string name="shuffle_all">Spel alle i tilfeldig rekkjefylgje</string>
+    <string name="action_shuffle_all">Spel alle i tilfeldig rekkjefylgje</string>
     <string name="last_opened">Sist opna</string>
     <string name="light_theme_name">Lys</string>
     <string name="dark_theme_name">Mørk</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index a8361031..9474eef6 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -86,7 +86,7 @@
     <string name="add_playlist_title">"Dodaj do listy odtwarzania"</string>
     <string name="new_playlist_title">Nowa lista odtwarzania</string>
     <string name="delete_warning">"Ostrzeżenie: Ta operacja nie może być cofnięta"</string>
-    <string name="shuffle_all">Wszystkie losowo</string>
+    <string name="action_shuffle_all">Wszystkie losowo</string>
     <string name="last_opened">Ostatnio otwarte</string>
     <string name="light_theme_name">Jasny</string>
     <string name="dark_theme_name">Ciemny</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 72422b61..82db18be 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -86,7 +86,7 @@
     <string name="add_playlist_title">"Adicionar à Playlist"</string>
     <string name="new_playlist_title">Nova Playlist</string>
     <string name="delete_warning">"Aviso: Esta operação não pode ser desfeita."</string>
-    <string name="shuffle_all">Misturar todas</string>
+    <string name="action_shuffle_all">Misturar todas</string>
     <string name="last_opened">Última aberta</string>
     <string name="light_theme_name">Claro</string>
     <string name="dark_theme_name">Escuro</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index b20af658..066a6999 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -51,7 +51,7 @@
     <string name="action_grid_columns">Colunas da grade</string>
     <string name="action_grid_columns_land">Colunas da grade (Paisagem)</string>
     <string name="delete_warning">"Aviso: Esta operação não pode ser desfeita."</string>
-    <string name="shuffle_all">Todas aleatoriamente</string>
+    <string name="action_shuffle_all">Todas aleatoriamente</string>
     <string name="last_opened">Abertas recentemente</string>
     <string name="light_theme_name">Claro</string>
     <string name="dark_theme_name">Escuro</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 07038df5..8a929b2d 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -64,7 +64,7 @@
     <string name="add_playlist_title">"Adaugă la Playlist"</string>
     <string name="new_playlist_title">Playlist Nou</string>
     <string name="delete_warning">"Atenţie: Această operaţie nu poate fi revocată."</string>
-    <string name="shuffle_all">Amestecă toate</string>
+    <string name="action_shuffle_all">Amestecă toate</string>
     <string name="last_opened">Ultimul deschis</string>
     <string name="light_theme_name">Light (Alb)</string>
     <string name="dark_theme_name">Dark (Negru)</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index b677f9f5..45b7b61a 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -71,7 +71,7 @@
     <string name="add_playlist_title">"Добавить в список воспроизведения"</string>
     <string name="new_playlist_title">Новый список воспроизведения</string>
     <string name="delete_warning">"Внимание ! Эта операция необратима."</string>
-    <string name="shuffle_all">Перемешать всё</string>
+    <string name="action_shuffle_all">Перемешать всё</string>
     <string name="last_opened">Последнее открытое</string>
     <string name="light_theme_name">Светлая</string>
     <string name="dark_theme_name">Тёмная</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 99686025..b974d92f 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -67,7 +67,7 @@ Vill du radera <b>%1$d</b> låtar?
     <string name="add_playlist_title">"Lägg till i spellista"</string>
     <string name="new_playlist_title">Ny spellista</string>
     <string name="delete_warning">"Varning: denna process kan inte ångras."</string>
-    <string name="shuffle_all">Slumpa alla</string>
+    <string name="action_shuffle_all">Slumpa alla</string>
     <string name="last_opened">Senast öppnad</string>
     <string name="light_theme_name">Ljus</string>
     <string name="dark_theme_name">Mörk</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 66567a3e..93f41a1b 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -86,7 +86,7 @@
     <string name="add_playlist_title">"Çalma Listesine Ekle"</string>
     <string name="new_playlist_title">Yeni Çalma Listesi</string>
     <string name="delete_warning">"Uyarı: Bu işlem geri alınamaz."</string>
-    <string name="shuffle_all">Hepsini Karıştır</string>
+    <string name="action_shuffle_all">Hepsini Karıştır</string>
     <string name="last_opened">Son Dinlenenler</string>
     <string name="light_theme_name">Açık</string>
     <string name="dark_theme_name">Koyu</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 33df4211..9a10c6d3 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -86,7 +86,7 @@
     <string name="add_playlist_title">"添加到播放列表"</string>
     <string name="new_playlist_title">新建播放列表</string>
     <string name="delete_warning">"警告：该操作无法撤销。"</string>
-    <string name="shuffle_all">随机播放全部曲目</string>
+    <string name="action_shuffle_all">随机播放全部曲目</string>
     <string name="last_opened">最后打开</string>
     <string name="light_theme_name">浅色</string>
     <string name="dark_theme_name">暗色</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 88ba1bfb..a16004a7 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -80,7 +80,7 @@
     <string name="add_playlist_title">"加入音樂清單"</string>
     <string name="new_playlist_title">新增音樂清單</string>
     <string name="delete_warning">"警告：這個操作無法被撤銷！"</string>
-    <string name="shuffle_all">隨機播放全部歌曲</string>
+    <string name="action_shuffle_all">隨機播放全部歌曲</string>
     <string name="last_opened">上次開啟</string>
     <string name="light_theme_name">明亮</string>
     <string name="dark_theme_name">暗沉</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 83899930..c7a648f8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -89,7 +89,10 @@
     <string name="add_playlist_title">"Add to Playlist"</string>
     <string name="new_playlist_title">New Playlist</string>
     <string name="delete_warning">"Warning: This operation can not be undone."</string>
-    <string name="shuffle_all">Shuffle All</string>
+    <string name="action_shuffle_all">Shuffle All</string>
+    <string name="action_shuffle_album">Shuffle Album</string>
+    <string name="action_shuffle_artist">Shuffle Artist</string>
+    <string name="action_shuffle_playlist">Shuffle Playlist</string>
     <string name="last_opened">Last Opened</string>
     <string name="light_theme_name">Light</string>
     <string name="dark_theme_name">Dark</string>