diff --git a/app/build.gradle b/app/build.gradle
index 1542b8bc..3aabd3c2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.kabouzeid.gramophone"
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 46
-        versionName "0.9.30b"
+        versionCode 47
+        versionName "0.9.31b dev-1"
     }
 
     buildTypes {
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index bb6a2ace..b54de584 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -68,7 +68,6 @@
     <string name="add_playlist_title">"إضافة إلى قائمة التشغيل"</string>
     <string name="new_playlist_title">قائمة تشغيل جديدة</string>
     <string name="delete_warning">"تحذير: لا يمكن التراجع عن هذه العملية."</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 0ac81f49..02facdc9 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -86,7 +86,6 @@
     <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="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 9a0fab87..7fa199c1 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -12,6 +12,8 @@
     <string name="action_now_playing">Jetzt Läuft</string>
     <string name="action_clear_playlist">Playlist leeren</string>
     <string name="action_playing_queue">Warteschlange</string>
+    <string name="action_add_to_favorites">Zu Favoriten hinzufügen</string>
+    <string name="action_remove_from_favorites">Von Favoriten entfernen</string>
     <string name="action_search">Suche</string>
     <string name="action_play_next">Als nächstes spielen</string>
     <string name="action_play">Abspielen</string>
@@ -68,6 +70,7 @@
     <string name="created_playlist_x">Wiedergabeliste %1$s erstellt</string>
     <string name="deleted_playlist_x">Wiedergabeliste %1$s gelöscht</string>
     <string name="deleted_x_songs">%1$d Titel gelöscht</string>
+    <string name="could_not_create_playlist">Konnte keine Wiedergabeliste erstellen</string>
     <string name="delete_playlist_x"><![CDATA[Willst du die Wiedergabeliste <b>%1$s</b> löschen?]]></string>
     <string name="clear_playlist_x"><![CDATA[Möchtest du die Playlist <b>%1$s</b> wirklich leeren?]]></string>
     <string name="delete_x_playlists"><![CDATA[Willst du <b>%1$d</b> Wiedergabelisten löschen?]]></string>
@@ -86,7 +89,6 @@
     <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="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 f5590399..9e02519c 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -69,7 +69,6 @@
     <string name="add_playlist_title">"Προσθήκη στη λίστα αναπαραγωγής"</string>
     <string name="new_playlist_title">Νέα λίστα αναπαραγωγής</string>
     <string name="delete_warning">"Προσοχή: Αυτή η ενέργεια δε μπορεί να αναιρεθεί."</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 d0965162..15ba678f 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -12,6 +12,8 @@
     <string name="action_now_playing">Reproducir ahora</string>
     <string name="action_clear_playlist">Limpiar lista de reproducción</string>
     <string name="action_playing_queue">Cola de reproducción</string>
+    <string name="action_add_to_favorites">Agregar a favoritos</string>
+    <string name="action_remove_from_favorites">Eliminar de favoritos</string>
     <string name="action_search">Buscar</string>
     <string name="action_play_next">Siguiente</string>
     <string name="action_play">Reproducir</string>
@@ -68,6 +70,7 @@
     <string name="created_playlist_x">Lista de reproducción %1$s creada</string>
     <string name="deleted_playlist_x">Lista de reproducción %1$s borrada</string>
     <string name="deleted_x_songs">Borrado las canciones {%1$d}</string>
+    <string name="could_not_create_playlist">No se pudo crear la lista de reproducción</string>
     <string name="delete_playlist_x"><![CDATA[¿Seguro que quiere borrar la lista de reproducción <b>%1$s</b>?]]></string>
     <string name="clear_playlist_x"><![CDATA[Realmente quieres limpiar la lista de reproducción {<b>} {</b>} {%1$s} ? ¡Esto no se puede deshacer!]]></string>
     <string name="delete_x_playlists"><![CDATA[
@@ -88,7 +91,6 @@
     <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="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 db6bff38..a4080f1f 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -65,7 +65,6 @@
     <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="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 e1930874..a47d9e9a 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -12,6 +12,8 @@
     <string name="action_now_playing">Lecture En Cours</string>
     <string name="action_clear_playlist">Effacer la playlist</string>
     <string name="action_playing_queue">File de lecture</string>
+    <string name="action_add_to_favorites">Ajouter aux favoris</string>
+    <string name="action_remove_from_favorites">Retirer des favoris</string>
     <string name="action_search">Rechercher</string>
     <string name="action_play_next">Prochaine lecture</string>
     <string name="action_play">Lecture</string>
@@ -68,6 +70,7 @@
     <string name="created_playlist_x">La playlist %1$s a été créée.</string>
     <string name="deleted_playlist_x">Playlist %1$s supprimée</string>
     <string name="deleted_x_songs">Supprimé %1$d des chansons</string>
+    <string name="could_not_create_playlist">Impossible de créer la playlist</string>
     <string name="delete_playlist_x"><![CDATA[Voulez-vous supprimer la playlist <b>%1$s</b> ?]]></string>
     <string name="clear_playlist_x"><![CDATA[Voulez-vous vraiment effacer la playlist <b>%1$s</b> ? Ceci ne peut pas être annulé!]]></string>
     <string name="delete_x_playlists"><![CDATA[Voulez-vous supprimer les playlists <b>%1$d</b> ?]]></string>
@@ -86,7 +89,6 @@
     <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="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 5be848a3..96fdb1c8 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -86,7 +86,6 @@
     <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="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 cfd6c06a..d2ca9615 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -86,7 +86,6 @@
     <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="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 4b33521e..b8db03dc 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -86,7 +86,6 @@
     <string name="add_playlist_title">"재생목록에 추가"</string>
     <string name="new_playlist_title">새로운 재생목록</string>
     <string name="delete_warning">"경고 : 이 작업은 되돌릴 수 없습니다."</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 10a8e96f..1df4844d 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -86,7 +86,6 @@
     <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="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 ef7e47eb..0adc9368 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -75,7 +75,6 @@
     <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="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 9474eef6..a2fd087c 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -12,6 +12,8 @@
     <string name="action_now_playing">Teraz gra</string>
     <string name="action_clear_playlist">Wyczyść listę odtwarzania</string>
     <string name="action_playing_queue">Kolejka odtwarzania</string>
+    <string name="action_add_to_favorites">Dodaj do ulubionych</string>
+    <string name="action_remove_from_favorites">Usuń z ulubionych</string>
     <string name="action_search">Szukaj</string>
     <string name="action_play_next">Odtwarzaj następny</string>
     <string name="action_play">Graj</string>
@@ -68,6 +70,7 @@
     <string name="created_playlist_x">Utworzono listę odtwarzania %1$s</string>
     <string name="deleted_playlist_x">Usunięto listę odtwarzania %1$s</string>
     <string name="deleted_x_songs">Usunięto %1$d utworów</string>
+    <string name="could_not_create_playlist">Nie można utworzyć listy odtwarzania</string>
     <string name="delete_playlist_x"><![CDATA[Czy chcesz usunąć listę odtwarzania <b>%1$s</b>?]]></string>
     <string name="clear_playlist_x"><![CDATA[Czy na pewno chcesz wyczyścić listę odtwarzania <b>%1$s</b>? Operacja nie może zostać cofnięta!]]></string>
     <string name="delete_x_playlists"><![CDATA[Czy chcesz usunąć <b>%1$d</b> listy odtwarzania?]]></string>
@@ -86,7 +89,6 @@
     <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="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 82db18be..a498187b 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -86,7 +86,6 @@
     <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="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 066a6999..e9cef92e 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -51,7 +51,6 @@
     <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="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 8a929b2d..9775c90f 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -64,7 +64,6 @@
     <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="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 45b7b61a..b36eb755 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -71,7 +71,6 @@
     <string name="add_playlist_title">"Добавить в список воспроизведения"</string>
     <string name="new_playlist_title">Новый список воспроизведения</string>
     <string name="delete_warning">"Внимание ! Эта операция необратима."</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 b974d92f..0c679874 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -67,7 +67,6 @@ 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="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 93f41a1b..69a06c7a 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -86,7 +86,6 @@
     <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="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 9a10c6d3..e5e96c87 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -86,7 +86,6 @@
     <string name="add_playlist_title">"添加到播放列表"</string>
     <string name="new_playlist_title">新建播放列表</string>
     <string name="delete_warning">"警告：该操作无法撤销。"</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 a16004a7..084a7436 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -80,7 +80,6 @@
     <string name="add_playlist_title">"加入音樂清單"</string>
     <string name="new_playlist_title">新增音樂清單</string>
     <string name="delete_warning">"警告：這個操作無法被撤銷！"</string>
-    <string name="action_shuffle_all">隨機播放全部歌曲</string>
     <string name="last_opened">上次開啟</string>
     <string name="light_theme_name">明亮</string>
     <string name="dark_theme_name">暗沉</string>