diff --git a/app/src/main/java/com/kabouzeid/gramophone/loader/PlaylistLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/PlaylistLoader.java
index 7795f1de..5cf652d3 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/loader/PlaylistLoader.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/loader/PlaylistLoader.java
@@ -27,6 +27,20 @@ public class PlaylistLoader {
         return playlist;
     }
 
+    public static Playlist getPlaylist(final Context context, final String playlistName) {
+        Playlist playlist = new Playlist();
+        Cursor cursor = makePlaylistCursor(context, PlaylistsColumns.NAME + "=?", new String[]{playlistName});
+
+        if (cursor != null && cursor.moveToFirst()) {
+            final int id = cursor.getInt(0);
+            final String name = cursor.getString(1);
+            playlist = new Playlist(id, name);
+        }
+        if (cursor != null)
+            cursor.close();
+        return playlist;
+    }
+
     public static List<Playlist> getAllPlaylists(final Context context) {
         List<Playlist> playlists = new ArrayList<>();
         Cursor cursor = makePlaylistCursor(context, null, null);
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 e01d44ed..1b10e6cd 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
@@ -391,6 +391,7 @@ public class MusicControllerActivity extends AbsFabActivity {
         setUpAlbumArtAndApplyPalette();
         songTotalTime.setText(MusicUtil.getReadableDurationString(song.duration));
         songCurrentProgress.setText(MusicUtil.getReadableDurationString(0));
+        invalidateOptionsMenu();
     }
 
     private void setHeadersText() {
@@ -548,6 +549,10 @@ public class MusicControllerActivity extends AbsFabActivity {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_music_playing, menu);
+        boolean isFavorite = MusicUtil.isFavorite(this, song);
+        menu.findItem(R.id.action_toggle_favorite)
+                .setIcon(isFavorite ? R.drawable.ic_favorite_white_24dp : R.drawable.ic_favorite_outline_white_24dp)
+                .setTitle(isFavorite ? getString(R.string.action_remove_from_favorites) : getString(R.string.action_add_to_favorites));
         return true;
     }
 
@@ -555,6 +560,10 @@ public class MusicControllerActivity extends AbsFabActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
         switch (id) {
+            case R.id.action_toggle_favorite:
+                MusicUtil.toggleFavorite(this, song);
+                invalidateOptionsMenu();
+                return true;
             case R.id.action_share:
                 SongShareDialog.create(song.id).show(getSupportFragmentManager(), "SHARE_SONG");
                 return true;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
index d0b26754..ca8da482 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
@@ -17,10 +17,12 @@ import android.widget.Toast;
 import com.kabouzeid.gramophone.App;
 import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
+import com.kabouzeid.gramophone.loader.PlaylistLoader;
 import com.kabouzeid.gramophone.loader.SongFilePathLoader;
 import com.kabouzeid.gramophone.loader.SongLoader;
 import com.kabouzeid.gramophone.model.Artist;
 import com.kabouzeid.gramophone.model.DataBaseChangedEvent;
+import com.kabouzeid.gramophone.model.Playlist;
 import com.kabouzeid.gramophone.model.Song;
 
 import java.io.File;
@@ -190,4 +192,24 @@ public class MusicUtil {
         Toast.makeText(context, context.getString(R.string.deleted_x_songs, songs.size()), Toast.LENGTH_SHORT).show();
         App.bus.post(new DataBaseChangedEvent(DataBaseChangedEvent.DATABASE_CHANGED));
     }
+
+    private static Playlist getFavoritesPlaylist(final Context context) {
+        return PlaylistLoader.getPlaylist(context, context.getString(R.string.favorites));
+    }
+
+    private static Playlist getOrCreateFavoritesPlaylist(final Context context) {
+        return PlaylistLoader.getPlaylist(context, PlaylistsUtil.createPlaylist(context, context.getString(R.string.favorites)));
+    }
+
+    public static boolean isFavorite(final Context context, final Song song) {
+        return PlaylistsUtil.doPlaylistContains(context, getFavoritesPlaylist(context).id, song.id);
+    }
+
+    public static void toggleFavorite(final Context context, final Song song) {
+        if (isFavorite(context, song)) {
+            PlaylistsUtil.removeFromPlaylist(context, song, getFavoritesPlaylist(context).id);
+        } else {
+            PlaylistsUtil.addToPlaylist(context, song, getOrCreateFavoritesPlaylist(context).id);
+        }
+    }
 }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/PlaylistsUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/PlaylistsUtil.java
index edafb2ac..c3831de4 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/PlaylistsUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/PlaylistsUtil.java
@@ -25,32 +25,36 @@ import java.util.List;
 public class PlaylistsUtil {
 
     public static int createPlaylist(final Context context, final String name) {
+        int id = -1;
         if (name != null && name.length() > 0) {
-            final ContentResolver resolver = context.getContentResolver();
-            final String[] projection = new String[]{
-                    MediaStore.Audio.PlaylistsColumns.NAME
-            };
-            final String selection = MediaStore.Audio.PlaylistsColumns.NAME + " = '" + name + "'";
-            Cursor cursor = resolver.query(MediaStore.Audio.Playlists.EXTERNAL_CONTENT_URI,
-                    projection, selection, null, null);
-            if (cursor.getCount() <= 0) {
+            Cursor cursor = context.getContentResolver().query(MediaStore.Audio.Playlists.EXTERNAL_CONTENT_URI,
+                    new String[]{MediaStore.Audio.Playlists._ID}, MediaStore.Audio.PlaylistsColumns.NAME + "=?", new String[]{name}, null);
+            if (cursor == null || cursor.getCount() < 1) {
                 final ContentValues values = new ContentValues(1);
                 values.put(MediaStore.Audio.PlaylistsColumns.NAME, name);
-                final Uri uri = resolver.insert(MediaStore.Audio.Playlists.EXTERNAL_CONTENT_URI,
+                final Uri uri = context.getContentResolver().insert(
+                        MediaStore.Audio.Playlists.EXTERNAL_CONTENT_URI,
                         values);
-                cursor.close();
                 if (uri != null) {
                     Toast.makeText(context, context.getResources().getString(
                             R.string.created_playlist_x, name), Toast.LENGTH_SHORT).show();
                     App.bus.post(new DataBaseChangedEvent(DataBaseChangedEvent.PLAYLISTS_CHANGED));
-                    return Integer.parseInt(uri.getLastPathSegment());
+                    id = Integer.parseInt(uri.getLastPathSegment());
+                }
+            } else {
+                if (cursor.moveToFirst()) {
+                    id = cursor.getInt(cursor.getColumnIndex(MediaStore.Audio.Playlists._ID));
                 }
             }
-            cursor.close();
+            if (cursor != null) {
+                cursor.close();
+            }
         }
-        Toast.makeText(context, context.getResources().getString(
-                R.string.couldnot_create_playlist_x, name), Toast.LENGTH_SHORT).show();
-        return -1;
+        if (id == -1) {
+            Toast.makeText(context, context.getResources().getString(
+                    R.string.could_not_create_playlist), Toast.LENGTH_SHORT).show();
+        }
+        return id;
     }
 
 //    public static void clearPlaylist(final Context context, final int playlistId) {
@@ -81,11 +85,11 @@ public class PlaylistsUtil {
         App.bus.post(new DataBaseChangedEvent(DataBaseChangedEvent.PLAYLISTS_CHANGED));
     }
 
-//    public static void addToPlaylist(final Context context, final Song song, final int playlistId) {
-//        List<Song> helperList = new ArrayList<>();
-//        helperList.add(song);
-//        addToPlaylist(context, helperList, playlistId);
-//    }
+    public static void addToPlaylist(final Context context, final Song song, final int playlistId) {
+        List<Song> helperList = new ArrayList<>();
+        helperList.add(song);
+        addToPlaylist(context, helperList, playlistId);
+    }
 
     public static void addToPlaylist(final Context context, final List<Song> songs, final int playlistId) {
         final int size = songs.size();
@@ -133,15 +137,15 @@ public class PlaylistsUtil {
         return contentValues;
     }
 
-//    public static void removeFromPlaylist(final Context context, final PlaylistSong song) {
-//        Uri uri = MediaStore.Audio.Playlists.Members.getContentUri(
-//                "external", song.playlistId);
-//        String selection = MediaStore.Audio.Playlists.Members._ID + " =?";
-//        String[] selectionArgs = new String[]{String.valueOf(song.idInPlayList)};
-//
-//        context.getContentResolver().delete(uri, selection, selectionArgs);
-//        App.bus.post(new DataBaseChangedEvent(DataBaseChangedEvent.PLAYLISTS_CHANGED));
-//    }
+    public static void removeFromPlaylist(final Context context, final Song song, int playlistId) {
+        Uri uri = MediaStore.Audio.Playlists.Members.getContentUri(
+                "external", playlistId);
+        String selection = MediaStore.Audio.Playlists.Members.AUDIO_ID + " =?";
+        String[] selectionArgs = new String[]{String.valueOf(song.id)};
+
+        context.getContentResolver().delete(uri, selection, selectionArgs);
+        App.bus.post(new DataBaseChangedEvent(DataBaseChangedEvent.PLAYLISTS_CHANGED));
+    }
 
     public static void removeFromPlaylist(final Context context, final List<PlaylistSong> songs) {
         final int playlistId = songs.get(0).playlistId;
@@ -158,7 +162,22 @@ public class PlaylistsUtil {
         context.getContentResolver().delete(uri, selection, selectionArgs);
         App.bus.post(new DataBaseChangedEvent(DataBaseChangedEvent.PLAYLISTS_CHANGED));
     }
-//
+
+    public static boolean doPlaylistContains(final Context context, final long playlistId, final int songId) {
+        if (playlistId != -1) {
+            Cursor c = context.getContentResolver().query(
+                    MediaStore.Audio.Playlists.Members.getContentUri("external", playlistId),
+                    new String[]{MediaStore.Audio.Playlists.Members.AUDIO_ID}, MediaStore.Audio.Playlists.Members.AUDIO_ID + "=?", new String[]{String.valueOf(songId)}, null);
+            int count = 0;
+            if (c != null) {
+                count = c.getCount();
+                c.close();
+            }
+            return count > 0;
+        }
+        return false;
+    }
+
 //    public static int getSongCountForPlaylist(final Context context, final long playlistId) {
 //        Cursor c = context.getContentResolver().query(
 //                MediaStore.Audio.Playlists.Members.getContentUri("external", playlistId),
diff --git a/app/src/main/res/menu/menu_music_playing.xml b/app/src/main/res/menu/menu_music_playing.xml
index 43685615..433d57bd 100644
--- a/app/src/main/res/menu/menu_music_playing.xml
+++ b/app/src/main/res/menu/menu_music_playing.xml
@@ -1,29 +1,34 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto"
-      xmlns:tools="http://schemas.android.com/tools"
-      tools:context="com.kabouzeid.gramophone.ui.activities.MusicControllerActivity">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.kabouzeid.gramophone.ui.activities.MusicControllerActivity">
 
     <item
         android:id="@+id/action_playing_queue"
         android:icon="@drawable/ic_queue_music_white_24dp"
         android:title="@string/action_playing_queue"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/action_toggle_favorite"
+        android:icon="@drawable/ic_favorite_outline_white_24dp"
+        android:title="@string/action_add_to_favorites"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/action_shuffle_all"
         android:title="@string/shuffle_all"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_add_to_playlist"
         android:title="@string/action_add_to_playlist"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_go_to_album"
         android:title="@string/action_go_to_album"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_go_to_artist"
         android:title="@string/action_go_to_artist"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_share"
         android:title="@string/action_share"
@@ -31,14 +36,14 @@
     <item
         android:id="@+id/action_tag_editor"
         android:title="@string/action_tag_editor"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_equalizer"
         android:orderInCategory="99"
         android:title="@string/equalizer"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_details"
         android:title="@string/action_details"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 0b65eb51..5f824e29 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -55,7 +55,7 @@
     <string name="inserted_x_songs_into_playlist">تم إدراج الأغاني %1$d إلى قائمة التشغيل</string>
     <string name="created_playlist_x">تم إنشاء قائمة التشغيل %1$s</string>
     <string name="deleted_playlist_x">تم حذف قائمة التشغيل %1$s</string>
-    <string name="couldnot_create_playlist_x">لا يمكن إنشاء قائمة التشغيل %1$s</string>
+    <string name="could_not_create_playlist">لا يمكن إنشاء قائمة التشغيل %1$s</string>
     <string name="delete_playlist_x"><![CDATA[
 هل تريد حذف قائمة التشغيل <b> %1$s </b>؟]]></string>
     <string name="delete_song_x"><![CDATA[
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index d145938a..93fa8459 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -68,7 +68,7 @@
     <string name="created_playlist_x">Vytvořen playlist %1$s</string>
     <string name="deleted_playlist_x">Playlist %1$s smazán</string>
     <string name="deleted_x_songs">Odstraněno %1$d skladeb</string>
-    <string name="couldnot_create_playlist_x">Playlist %1$s nelze vytvořit</string>
+    <string name="could_not_create_playlist">Playlist %1$s nelze vytvořit</string>
     <string name="delete_playlist_x"><![CDATA[Opravdu chcete vymazat playlist <b>%1$s</b> ?]]></string>
     <string name="clear_playlist_x"><![CDATA[Opravdu chcete vyčistit playlist <b>%1$s</b>? Tato operace je nevratná!]]></string>
     <string name="delete_x_playlists"><![CDATA[Chcete smazat <b>%1$d</b> playlistů?]]></string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c472c67f..700c80f2 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -68,7 +68,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="couldnot_create_playlist_x">Wiedergabeliste %1$s konnte nicht erstellt werden</string>
+    <string name="could_not_create_playlist">Wiedergabeliste %1$s konnte nicht erstellt werden</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>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index b6f645f2..a5f238a8 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -55,7 +55,7 @@
     <string name="inserted_x_songs_into_playlist">Προστέθηκαν %1$d τραγούδια σε αυτή τη λίστα αναπαραγωγής</string>
     <string name="created_playlist_x">Δημιουργήθηκε η λίστα αναπαραγωγής %1$s</string>
     <string name="deleted_playlist_x">Διεγράφη η λίστα αναπαραγωγής %1$s</string>
-    <string name="couldnot_create_playlist_x">Δεν μπόρεσε να δημιουργηθεί η λίστα αναπαραγωγής %1$s</string>
+    <string name="could_not_create_playlist">Δεν μπόρεσε να δημιουργηθεί η λίστα αναπαραγωγής %1$s</string>
     <string name="delete_playlist_x"><![CDATA[Θέλετε να διαγράψετε τη λίστα αναπαραγωγής <b>%1$s</b>;]]></string>
     <string name="delete_x_playlists"><![CDATA[
         Θα θέλατε να διαγράψετε <b>%1$d</b> λίστες αναπαραγωγής; 
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index b3d2b3d3..db264abe 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -68,7 +68,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="couldnot_create_playlist_x">No se puede crear la lista de reproducción %1$s</string>
+    <string name="could_not_create_playlist">No se puede crear la lista de reproducción %1$s</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[
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 0c06e899..d46689ab 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -55,7 +55,7 @@
     <string name="inserted_x_songs_into_playlist">{%1$d} kappaletta lisättiin tähän soittolistaan</string>
     <string name="created_playlist_x">Soittolista {%1$s} luotu</string>
     <string name="deleted_playlist_x">Soittolista {%1$s} poistettu</string>
-    <string name="couldnot_create_playlist_x">Soittolistaa {%1$s} ei voitu luoda</string>
+    <string name="could_not_create_playlist">Soittolistaa {%1$s} ei voitu luoda</string>
     <string name="delete_playlist_x"><![CDATA[Haluatko poistaa soittolistan {<b>}{%1$s}{</b>}?]]></string>
     <string name="delete_song_x"><![CDATA[Haluatko poistaa kappaleen {<b>}{%1$s}{</b>}?]]></string>
     <string name="delete_x_songs"><![CDATA[Haluatko poistaa {<b>}{%1$d}{</b>} kappaletta?]]></string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index da75df52..bd4151ff 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -68,7 +68,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="couldnot_create_playlist_x">Impossible de créer la playlist %1$s.</string>
+    <string name="could_not_create_playlist">Impossible de créer la playlist %1$s.</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>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index cb725c8f..18b9452f 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -68,7 +68,7 @@
     <string name="created_playlist_x">Stvoren popis pjesama %1$s</string>
     <string name="deleted_playlist_x">Obrisan popis pjesama %1$s</string>
     <string name="deleted_x_songs">Obrisano %1$d pjesama</string>
-    <string name="couldnot_create_playlist_x">Nije bilo moguće stvoriti popis pjesama %1$s</string>
+    <string name="could_not_create_playlist">Nije bilo moguće stvoriti popis pjesama %1$s</string>
     <string name="delete_playlist_x"><![CDATA[Želite li obrisati popis pjesama <b>%1$s</b>?]]></string>
     <string name="clear_playlist_x"><![CDATA[Želite li stvarno isprazniti popis pjesama <b>%1$s</b>? Ovaj postupak se ne može poništiti!]]></string>
     <string name="delete_x_playlists"><![CDATA[Želite li obrisati popise pjesama <b>%1$d</b>?]]></string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 148c28ba..2470960a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -68,7 +68,7 @@
     <string name="created_playlist_x">Playlist %1$s creata</string>
     <string name="deleted_playlist_x">Playlist %1$s eliminata</string>
     <string name="deleted_x_songs">%1$d brani eliminati</string>
-    <string name="couldnot_create_playlist_x">Impossibile creare playlist %1$s</string>
+    <string name="could_not_create_playlist">Impossibile creare playlist %1$s</string>
     <string name="delete_playlist_x"><![CDATA[        Vuoi eliminare la playlist <b>%1$s</b>? ]]></string>
     <string name="clear_playlist_x"><![CDATA[Vuoi davvero svuotare la playlist <b>%1$s</b>? L\'operazione non può essere annullata!]]></string>
     <string name="delete_x_playlists"><![CDATA[        Vuoi eliminare <b>%1$d</b> playlist? ]]></string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 68dbfc81..cc61a0df 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -68,7 +68,7 @@
     <string name="created_playlist_x">재생 목록 \'%1$s\'을 만들었습니다.</string>
     <string name="deleted_playlist_x">재생목록 \'%1$s\'을 삭제했습니다.</string>
     <string name="deleted_x_songs"><b>%1$d</b>개의 노래를 삭제하시겠습니까?</string>
-    <string name="couldnot_create_playlist_x">재생목록 \'%1$s\'을(를) 만들 수 없습니다.</string>
+    <string name="could_not_create_playlist">재생목록 \'%1$s\'을(를) 만들 수 없습니다.</string>
     <string name="delete_playlist_x"><![CDATA[재생목록 <b>%1$s</b>을(를) 삭제하시겠습니까?]]></string>
     <string name="clear_playlist_x"><![CDATA[노래 <b>%1$s</b>을(를) 재생목록에서 삭제하시겠습니까?]]></string>
     <string name="delete_x_playlists"><![CDATA[재생목록 <b>%1$d</b>을(를) 삭제하시겠습니까?]]></string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index aab31407..0ad66c35 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -68,7 +68,7 @@
     <string name="created_playlist_x">Afspeellijst %1$s aangemaakt</string>
     <string name="deleted_playlist_x">Afspeellijst %1$s verwijderd</string>
     <string name="deleted_x_songs">%1$d nummers verwijderd</string>
-    <string name="couldnot_create_playlist_x">Kan afspeellijst %1$s niet aanmaken</string>
+    <string name="could_not_create_playlist">Kan afspeellijst %1$s niet aanmaken</string>
     <string name="delete_playlist_x"><![CDATA[Wil je de afspeellijst <b>%1$s</b> verwijderen?]]></string>
     <string name="clear_playlist_x"><![CDATA[Weet je zeker dat je de afspeellijst <b>%1$s</b> wilt vrijmaken? Dit kan niet ongedaan gemaakt worden!]]></string>
     <string name="delete_x_playlists"><![CDATA[Wil je <b>%1$d</b> afspeellijsten verwijderen?]]></string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index 786dcec6..4ab237e4 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -55,7 +55,7 @@
     <string name="inserted_x_songs_into_playlist">Satte inn %1$d songar i denne spelelista.</string>
     <string name="created_playlist_x">Oppretta speleliste %1$s</string>
     <string name="deleted_playlist_x">Sletta speleliste %1$s</string>
-    <string name="couldnot_create_playlist_x">Kunne ikkje opprette speleliste %1$s</string>
+    <string name="could_not_create_playlist">Kunne ikkje opprette speleliste %1$s</string>
     <string name="delete_playlist_x"><![CDATA[
         Ynskjer du å slette spelelista <b>%1$s</b>? 
     ]]></string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index aaf4d34c..0b3eb59b 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -68,7 +68,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="couldnot_create_playlist_x">Nie można utworzyć listy odtwarzania %1$s</string>
+    <string name="could_not_create_playlist">Nie można utworzyć listy odtwarzania %1$s</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>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 9963e098..dcc403c2 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -68,7 +68,7 @@
     <string name="created_playlist_x">A playlist %1$s foi criada</string>
     <string name="deleted_playlist_x">A playlist %1$s foi excluída</string>
     <string name="deleted_x_songs">%1$d músicas excluidas</string>
-    <string name="couldnot_create_playlist_x">Não foi possível criar a playlist %1$s</string>
+    <string name="could_not_create_playlist">Não foi possível criar a playlist %1$s</string>
     <string name="delete_playlist_x"><![CDATA[ Deseja excluir a playlist <b>%1$s</b>? ]]></string>
     <string name="clear_playlist_x"><![CDATA[Você realmente quer limpar a playlist <b>%1$s</b>? Isto não pode ser desfeito!]]></string>
     <string name="delete_x_playlists"><![CDATA[ Deseja excluir <b>%1$d</b> playlists? ]]></string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index f35ae812..eff15101 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -54,7 +54,7 @@
     <string name="inserted_x_songs_into_playlist">Inserate %1$d melodii in playlist</string>
     <string name="created_playlist_x">Creat playlistul %1$s</string>
     <string name="deleted_playlist_x">Șters playlistul %1$s</string>
-    <string name="couldnot_create_playlist_x">Nu a putut fi creat playlistul %1$s</string>
+    <string name="could_not_create_playlist">Nu a putut fi creat playlistul %1$s</string>
     <string name="delete_playlist_x"><![CDATA[Vrei să ștergi playlistul <b> %1$s </b>]]></string>
     <string name="delete_song_x"><![CDATA[Vrei să ștergi melodia <b> %1$s </b> ?]]></string>
     <string name="delete_x_songs"><![CDATA[Vrei să ștergi <b> %1$d </b> melodii ?]]></string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index dbd064e7..49992c8b 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -57,7 +57,7 @@
     <string name="inserted_x_songs_into_playlist">Вставлено %1$d песен в список воспроизведения.</string>
     <string name="created_playlist_x">Список воспроизведения %1$s создан</string>
     <string name="deleted_playlist_x">Список воспроизведения %1$s удалён</string>
-    <string name="couldnot_create_playlist_x">Невозможно создать список воспроизведения %1$s</string>
+    <string name="could_not_create_playlist">Невозможно создать список воспроизведения %1$s</string>
     <string name="delete_playlist_x"><![CDATA[ Вы хотите удалить список воспроизведения <b>%1$s</b>? ]]></string>
     <string name="delete_x_playlists"><![CDATA[
         Вы хотите удалить списки воспроизведения <b>%1$d</b> ? 
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index cca48e08..ec7120d9 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -51,7 +51,7 @@
     <string name="new_playlist_action">Ny spellista ...</string>
     <string name="created_playlist_x">Spellista %1$s skapad</string>
     <string name="deleted_playlist_x">Spellista %1$s raderad</string>
-    <string name="couldnot_create_playlist_x">Kunde inte skapa spellistan %1$s</string>
+    <string name="could_not_create_playlist">Kunde inte skapa spellistan %1$s</string>
     <string name="delete_playlist_x"><![CDATA[
 Vill du radera spellistan <b>%1$s</b>?
     ]]></string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 7f72dd5c..e7556ac5 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -68,7 +68,7 @@
     <string name="created_playlist_x">Çalma listesi %1$s oluşturuldu</string>
     <string name="deleted_playlist_x">Çalma listesi %1$s silindi</string>
     <string name="deleted_x_songs">%1$d parça silindi</string>
-    <string name="couldnot_create_playlist_x">Çalma listesi %1$s oluşturulamadı</string>
+    <string name="could_not_create_playlist">Çalma listesi %1$s oluşturulamadı</string>
     <string name="delete_playlist_x"><![CDATA[<b>%1$s</b> çalma listesini silmek istiyor musunuz?]]></string>
     <string name="clear_playlist_x"><![CDATA[<b>%1$s</b> çalma listesini temizlemek istediğinize emin misiniz? Bu geri döndürülemez!]]></string>
     <string name="delete_x_playlists"><![CDATA[<b>%1$d</b> çalma listelerini silmek istiyor musunuz?]]></string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 3b5c2afd..4868997e 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -68,7 +68,7 @@
     <string name="created_playlist_x">播放列表%1$s已创建</string>
     <string name="deleted_playlist_x">%1$s播放列表已删除</string>
     <string name="deleted_x_songs">%1$d 首歌曲已删除</string>
-    <string name="couldnot_create_playlist_x">创建播放列表%1$s失败</string>
+    <string name="could_not_create_playlist">创建播放列表%1$s失败</string>
     <string name="delete_playlist_x"><![CDATA[确认要删除此播放列表：<b>%1$s</b>？]]></string>
     <string name="clear_playlist_x"><![CDATA[你真的想清除播放列表<b>%1$s</b>吗？该操作不可撤销！]]></string>
     <string name="delete_x_playlists"><![CDATA[确认要删除以下<b>%1$d</b>个播放列表？]]></string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 745b942c..a77479d1 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -62,7 +62,7 @@
     <string name="inserted_x_songs_into_playlist">%1$d首歌曲已加入該音樂清單</string>
     <string name="created_playlist_x">已新增音樂清單%1$s</string>
     <string name="deleted_playlist_x">已刪除音樂清單%1$s</string>
-    <string name="couldnot_create_playlist_x">無法建立音樂清單%1$s</string>
+    <string name="could_not_create_playlist">無法建立音樂清單%1$s</string>
     <string name="delete_playlist_x"><![CDATA[
 你想刪除這個音樂清單： <b>%1$s</b>嗎？
     ]]></string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 69653d43..83899930 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,6 +12,8 @@
     <string name="action_now_playing">Now Playing</string>
     <string name="action_clear_playlist">Clear Playlist</string>
     <string name="action_playing_queue">Playing Queue</string>
+    <string name="action_add_to_favorites">Add to favorites</string>
+    <string name="action_remove_from_favorites">Remove from favorites</string>
     <string name="action_search">Search</string>
     <string name="action_play_next">Play Next</string>
     <string name="action_play">Play</string>
@@ -68,7 +70,7 @@
     <string name="created_playlist_x">Created playlist %1$s</string>
     <string name="deleted_playlist_x">Deleted playlist %1$s</string>
     <string name="deleted_x_songs">Deleted %1$d songs</string>
-    <string name="couldnot_create_playlist_x">Could not create playlist %1$s</string>
+    <string name="could_not_create_playlist">Could not create playlist</string>
     <string name="delete_playlist_x"><![CDATA[Do you want to delete the playlist <b>%1$s</b>?]]></string>
     <string name="clear_playlist_x"><![CDATA[Do you really want to clear the playlist <b>%1$s</b>? This cannot be undone!]]></string>
     <string name="delete_x_playlists"><![CDATA[Do you want to delete <b>%1$d</b> playlists?]]></string>