diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 659021db..6a3b63ec 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:a="http://schemas.android.com/apk/res/android"
     package="com.thejoshwa.ultrasonic.androidapp"
     a:installLocation="auto"
-    a:versionCode="10"
-    a:versionName="1.1.0.6" >
+    a:versionCode="12"
+    a:versionName="1.1.0.8" >
 
     <uses-permission a:name="android.permission.INTERNET" />
     <uses-permission a:name="android.permission.READ_PHONE_STATE" />
diff --git a/gen/com/handmark/pulltorefresh/library/R.java b/gen/com/handmark/pulltorefresh/library/R.java
index 0057b6e4..0ad69fb7 100644
--- a/gen/com/handmark/pulltorefresh/library/R.java
+++ b/gen/com/handmark/pulltorefresh/library/R.java
@@ -9,19 +9,19 @@ package com.handmark.pulltorefresh.library;
 public final class R {
 	public static final class id {
 		public static final int pullFromStart = 0x7f060001;
-		public static final int pull_to_refresh_progress = 0x7f06007d;
+		public static final int pull_to_refresh_progress = 0x7f06007e;
 		public static final int rotate = 0x7f060007;
 		public static final int both = 0x7f060003;
 		public static final int webview = 0x7f06000a;
-		public static final int pull_to_refresh_text = 0x7f06007e;
+		public static final int pull_to_refresh_text = 0x7f06007f;
 		public static final int pullDownFromTop = 0x7f060005;
 		public static final int gridview = 0x7f060009;
 		public static final int pullUpFromBottom = 0x7f060006;
 		public static final int scrollview = 0x7f06000b;
 		public static final int pullFromEnd = 0x7f060002;
-		public static final int pull_to_refresh_image = 0x7f06007c;
-		public static final int pull_to_refresh_sub_text = 0x7f06007f;
-		public static final int fl_inner = 0x7f06007b;
+		public static final int pull_to_refresh_image = 0x7f06007d;
+		public static final int pull_to_refresh_sub_text = 0x7f060080;
+		public static final int fl_inner = 0x7f06007c;
 		public static final int flip = 0x7f060008;
 		public static final int disabled = 0x7f060000;
 		public static final int manualOnly = 0x7f060004;
diff --git a/gen/com/thejoshwa/ultrasonic/androidapp/R.java b/gen/com/thejoshwa/ultrasonic/androidapp/R.java
index 87d9ee6f..77eb1a68 100644
--- a/gen/com/thejoshwa/ultrasonic/androidapp/R.java
+++ b/gen/com/thejoshwa/ultrasonic/androidapp/R.java
@@ -176,7 +176,15 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
         /** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
 or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
          */
-        public static final int media_play_small=0x7f01003d;
+        public static final int media_play_next=0x7f01003e;
+        /** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
+or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
+         */
+        public static final int media_play_now=0x7f01003d;
+        /** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
+or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
+         */
+        public static final int media_play_small=0x7f01003f;
         /** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
 or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
          */
@@ -200,11 +208,11 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
         /** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
 or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
          */
-        public static final int media_stop=0x7f01003e;
+        public static final int media_stop=0x7f010040;
         /** <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
 or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
          */
-        public static final int media_toggle=0x7f01003f;
+        public static final int media_toggle=0x7f010041;
         /**  Reference to a style for the menu drawer. 
          <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
 or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
@@ -522,135 +530,139 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
         public static final int media_pause_normal=0x7f02005e;
         public static final int media_pause_normal_dark=0x7f02005f;
         public static final int media_pause_normal_light=0x7f020060;
-        public static final int media_repeat_all=0x7f020061;
-        public static final int media_repeat_off=0x7f020062;
-        public static final int media_repeat_off_dark=0x7f020063;
-        public static final int media_repeat_off_light=0x7f020064;
-        public static final int media_repeat_single=0x7f020065;
-        public static final int media_shuffle_normal=0x7f020066;
-        public static final int media_shuffle_normal_dark=0x7f020067;
-        public static final int media_shuffle_normal_light=0x7f020068;
-        public static final int media_start_normal=0x7f020069;
-        public static final int media_start_normal_dark=0x7f02006a;
-        public static final int media_start_normal_light=0x7f02006b;
-        public static final int media_start_pressed=0x7f02006c;
-        public static final int media_stop_normal=0x7f02006d;
-        public static final int media_stop_normal_dark=0x7f02006e;
-        public static final int media_stop_normal_light=0x7f02006f;
-        public static final int media_toggle_list_normal=0x7f020070;
-        public static final int media_toggle_list_normal_dark=0x7f020071;
-        public static final int media_toggle_list_normal_light=0x7f020072;
-        public static final int menu_arrow=0x7f020073;
-        public static final int menu_arrow_bottom=0x7f020074;
-        public static final int menu_arrow_right=0x7f020075;
-        public static final int menu_arrow_top=0x7f020076;
-        public static final int menubar_button_disabled=0x7f020077;
-        public static final int menubar_button_normal=0x7f020078;
-        public static final int notify_panel_notification_icon_bg=0x7f020079;
-        public static final int pinstripe_tile=0x7f02007a;
-        public static final int preview=0x7f02007b;
-        public static final int preview_two=0x7f02007c;
-        public static final int progress_bg_holo_dark=0x7f02007d;
-        public static final int progress_horizontal_holo_dark=0x7f02007e;
-        public static final int progress_primary_holo_dark=0x7f02007f;
-        public static final int progress_secondary_holo_dark=0x7f020080;
-        public static final int select_album_play_all=0x7f020081;
-        public static final int select_album_play_all_normal=0x7f020082;
-        public static final int select_album_play_all_pressed=0x7f020083;
-        public static final int status_bg=0x7f020084;
-        public static final int title_bar_shadow=0x7f020085;
-        public static final int unknown_album=0x7f020086;
-        public static final int unknown_album_large=0x7f020087;
+        public static final int media_play_next_dark=0x7f020061;
+        public static final int media_play_next_light=0x7f020062;
+        public static final int media_play_now_dark=0x7f020063;
+        public static final int media_play_now_light=0x7f020064;
+        public static final int media_repeat_all=0x7f020065;
+        public static final int media_repeat_off=0x7f020066;
+        public static final int media_repeat_off_dark=0x7f020067;
+        public static final int media_repeat_off_light=0x7f020068;
+        public static final int media_repeat_single=0x7f020069;
+        public static final int media_shuffle_normal=0x7f02006a;
+        public static final int media_shuffle_normal_dark=0x7f02006b;
+        public static final int media_shuffle_normal_light=0x7f02006c;
+        public static final int media_start_normal=0x7f02006d;
+        public static final int media_start_normal_dark=0x7f02006e;
+        public static final int media_start_normal_light=0x7f02006f;
+        public static final int media_start_pressed=0x7f020070;
+        public static final int media_stop_normal=0x7f020071;
+        public static final int media_stop_normal_dark=0x7f020072;
+        public static final int media_stop_normal_light=0x7f020073;
+        public static final int media_toggle_list_normal=0x7f020074;
+        public static final int media_toggle_list_normal_dark=0x7f020075;
+        public static final int media_toggle_list_normal_light=0x7f020076;
+        public static final int menu_arrow=0x7f020077;
+        public static final int menu_arrow_bottom=0x7f020078;
+        public static final int menu_arrow_right=0x7f020079;
+        public static final int menu_arrow_top=0x7f02007a;
+        public static final int menubar_button_disabled=0x7f02007b;
+        public static final int menubar_button_normal=0x7f02007c;
+        public static final int notify_panel_notification_icon_bg=0x7f02007d;
+        public static final int pinstripe_tile=0x7f02007e;
+        public static final int preview=0x7f02007f;
+        public static final int preview_two=0x7f020080;
+        public static final int progress_bg_holo_dark=0x7f020081;
+        public static final int progress_horizontal_holo_dark=0x7f020082;
+        public static final int progress_primary_holo_dark=0x7f020083;
+        public static final int progress_secondary_holo_dark=0x7f020084;
+        public static final int select_album_play_all=0x7f020085;
+        public static final int select_album_play_all_normal=0x7f020086;
+        public static final int select_album_play_all_pressed=0x7f020087;
+        public static final int status_bg=0x7f020088;
+        public static final int title_bar_shadow=0x7f020089;
+        public static final int unknown_album=0x7f02008a;
+        public static final int unknown_album_large=0x7f02008b;
     }
     public static final class id {
-        public static final int album=0x7f060072;
-        public static final int album_artist=0x7f06001c;
-        public static final int album_coverart=0x7f06001a;
-        public static final int album_menu_pin=0x7f0600b1;
-        public static final int album_menu_play_last=0x7f0600b0;
-        public static final int album_menu_play_now=0x7f0600af;
-        public static final int album_star=0x7f06001d;
-        public static final int album_title=0x7f06001b;
-        public static final int appwidget_coverart=0x7f06001e;
-        public static final int appwidget_top=0x7f060020;
-        public static final int artist=0x7f060022;
-        public static final int artist_menu_pin=0x7f0600b4;
-        public static final int artist_menu_play_last=0x7f0600b3;
-        public static final int artist_menu_play_now=0x7f0600b2;
+        public static final int album=0x7f060073;
+        public static final int album_artist=0x7f06001d;
+        public static final int album_coverart=0x7f06001b;
+        public static final int album_menu_pin=0x7f0600b2;
+        public static final int album_menu_play_last=0x7f0600b1;
+        public static final int album_menu_play_now=0x7f0600b0;
+        public static final int album_star=0x7f06001e;
+        public static final int album_title=0x7f06001c;
+        public static final int appwidget_coverart=0x7f06001f;
+        public static final int appwidget_top=0x7f060021;
+        public static final int artist=0x7f060023;
+        public static final int artist_menu_pin=0x7f0600b5;
+        public static final int artist_menu_play_last=0x7f0600b4;
+        public static final int artist_menu_play_now=0x7f0600b3;
         public static final int both=0x7f060003;
-        public static final int control_next=0x7f060025;
-        public static final int control_play=0x7f060024;
-        public static final int control_previous=0x7f060023;
-        public static final int control_stop=0x7f060073;
+        public static final int control_next=0x7f060026;
+        public static final int control_play=0x7f060025;
+        public static final int control_previous=0x7f060024;
+        public static final int control_stop=0x7f060074;
         public static final int disabled=0x7f060000;
-        public static final int download_album=0x7f06003a;
-        public static final int download_album_art_image=0x7f060034;
-        public static final int download_album_art_layout=0x7f060033;
-        public static final int download_artist=0x7f060039;
-        public static final int download_button_bar_flipper=0x7f060036;
-        public static final int download_control_layout=0x7f060026;
-        public static final int download_duration=0x7f060038;
-        public static final int download_empty=0x7f06003b;
-        public static final int download_equalizer=0x7f0600a4;
-        public static final int download_jukebox=0x7f0600a6;
-        public static final int download_list=0x7f06003c;
-        public static final int download_next=0x7f06002c;
-        public static final int download_pause=0x7f060029;
-        public static final int download_playlist_flipper=0x7f060032;
-        public static final int download_position=0x7f060037;
-        public static final int download_previous=0x7f060028;
-        public static final int download_progress_bar=0x7f06003d;
-        public static final int download_repeat=0x7f06002d;
-        public static final int download_shuffle=0x7f060027;
-        public static final int download_song_title=0x7f060031;
-        public static final int download_star=0x7f06002e;
-        public static final int download_start=0x7f06002b;
-        public static final int download_status=0x7f060030;
-        public static final int download_stop=0x7f06002a;
-        public static final int download_toggle_list=0x7f06002f;
-        public static final int download_visualizer=0x7f0600a5;
-        public static final int download_visualizer_view_layout=0x7f060035;
-        public static final int equalizer_bar=0x7f060043;
-        public static final int equalizer_frequency=0x7f060041;
-        public static final int equalizer_level=0x7f060042;
-        public static final int equalizer_enabled=0x7f06003e;
-        public static final int equalizer_layout=0x7f06003f;
-        public static final int equalizer_preset=0x7f060040;
-        public static final int fl_inner=0x7f06007b;
+        public static final int download_album=0x7f06003b;
+        public static final int download_album_art_image=0x7f060035;
+        public static final int download_album_art_layout=0x7f060034;
+        public static final int download_artist=0x7f06003a;
+        public static final int download_button_bar_flipper=0x7f060037;
+        public static final int download_control_layout=0x7f060027;
+        public static final int download_duration=0x7f060039;
+        public static final int download_empty=0x7f06003c;
+        public static final int download_equalizer=0x7f0600a5;
+        public static final int download_jukebox=0x7f0600a7;
+        public static final int download_list=0x7f06003d;
+        public static final int download_next=0x7f06002d;
+        public static final int download_pause=0x7f06002a;
+        public static final int download_playlist_flipper=0x7f060033;
+        public static final int download_position=0x7f060038;
+        public static final int download_previous=0x7f060029;
+        public static final int download_progress_bar=0x7f06003e;
+        public static final int download_repeat=0x7f06002e;
+        public static final int download_shuffle=0x7f060028;
+        public static final int download_song_title=0x7f060032;
+        public static final int download_star=0x7f06002f;
+        public static final int download_start=0x7f06002c;
+        public static final int download_status=0x7f060031;
+        public static final int download_stop=0x7f06002b;
+        public static final int download_toggle_list=0x7f060030;
+        public static final int download_visualizer=0x7f0600a6;
+        public static final int download_visualizer_view_layout=0x7f060036;
+        public static final int equalizer_bar=0x7f060044;
+        public static final int equalizer_frequency=0x7f060042;
+        public static final int equalizer_level=0x7f060043;
+        public static final int equalizer_enabled=0x7f06003f;
+        public static final int equalizer_layout=0x7f060040;
+        public static final int equalizer_preset=0x7f060041;
+        public static final int fl_inner=0x7f06007c;
         public static final int flip=0x7f060008;
         public static final int gridview=0x7f060009;
-        public static final int help_back=0x7f060045;
-        public static final int help_buttons=0x7f060044;
-        public static final int help_close=0x7f060046;
-        public static final int help_contents=0x7f060047;
-        public static final int jukebox_volume_progress_bar=0x7f060049;
-        public static final int linearLayout1=0x7f06001f;
-        public static final int lyrics_artist=0x7f06004b;
-        public static final int lyrics_scrollview=0x7f06004a;
-        public static final int lyrics_text=0x7f06004d;
-        public static final int lyrics_title=0x7f06004c;
-        public static final int main_select_server_1=0x7f060051;
-        public static final int main_select_server_2=0x7f060052;
-        public static final int main_albums=0x7f06005a;
-        public static final int main_albums_alphaByArtist=0x7f060062;
-        public static final int main_albums_alphaByName=0x7f060061;
-        public static final int main_albums_button=0x7f060055;
-        public static final int main_albums_frequent=0x7f06005d;
-        public static final int main_albums_highest=0x7f06005e;
-        public static final int main_albums_newest=0x7f06005b;
-        public static final int main_albums_random=0x7f06005f;
-        public static final int main_albums_recent=0x7f06005c;
-        public static final int main_albums_starred=0x7f060060;
-        public static final int main_artists_button=0x7f060054;
-        public static final int main_dummy=0x7f06004f;
-        public static final int main_genres_button=0x7f060056;
-        public static final int main_list=0x7f06004e;
-        public static final int main_music=0x7f060053;
-        public static final int main_select_server=0x7f060050;
-        public static final int main_shuffle=0x7f0600a3;
-        public static final int main_songs=0x7f060057;
-        public static final int main_songs_button=0x7f060058;
-        public static final int main_songs_starred=0x7f060059;
+        public static final int help_back=0x7f060046;
+        public static final int help_buttons=0x7f060045;
+        public static final int help_close=0x7f060047;
+        public static final int help_contents=0x7f060048;
+        public static final int jukebox_volume_progress_bar=0x7f06004a;
+        public static final int linearLayout1=0x7f060020;
+        public static final int lyrics_artist=0x7f06004c;
+        public static final int lyrics_scrollview=0x7f06004b;
+        public static final int lyrics_text=0x7f06004e;
+        public static final int lyrics_title=0x7f06004d;
+        public static final int main_select_server_1=0x7f060052;
+        public static final int main_select_server_2=0x7f060053;
+        public static final int main_albums=0x7f06005b;
+        public static final int main_albums_alphaByArtist=0x7f060063;
+        public static final int main_albums_alphaByName=0x7f060062;
+        public static final int main_albums_button=0x7f060056;
+        public static final int main_albums_frequent=0x7f06005e;
+        public static final int main_albums_highest=0x7f06005f;
+        public static final int main_albums_newest=0x7f06005c;
+        public static final int main_albums_random=0x7f060060;
+        public static final int main_albums_recent=0x7f06005d;
+        public static final int main_albums_starred=0x7f060061;
+        public static final int main_artists_button=0x7f060055;
+        public static final int main_dummy=0x7f060050;
+        public static final int main_genres_button=0x7f060057;
+        public static final int main_list=0x7f06004f;
+        public static final int main_music=0x7f060054;
+        public static final int main_select_server=0x7f060051;
+        public static final int main_shuffle=0x7f0600a4;
+        public static final int main_songs=0x7f060058;
+        public static final int main_songs_button=0x7f060059;
+        public static final int main_songs_starred=0x7f06005a;
         public static final int manualOnly=0x7f060004;
         /**  Used with View#setTag(int) to specify a position for the active view. 
          */
@@ -670,94 +682,92 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
         /**  The ID of the menu container. 
          */
         public static final int md__menu=0x7f06000f;
-        public static final int menu_about=0x7f06006c;
+        public static final int menu_about=0x7f06006d;
         public static final int menu_album=0x7f060012;
-        public static final int menu_browse=0x7f060066;
-        public static final int menu_common=0x7f06006a;
-        public static final int menu_exit=0x7f06006d;
-        public static final int menu_home=0x7f060065;
-        public static final int menu_lyrics=0x7f0600ab;
-        public static final int menu_main=0x7f060063;
-        public static final int menu_navigation=0x7f060064;
-        public static final int menu_now_playing=0x7f060069;
-        public static final int menu_playlists=0x7f060068;
-        public static final int menu_remove=0x7f0600ac;
-        public static final int menu_remove_all=0x7f0600a8;
-        public static final int menu_save_playlist=0x7f0600a7;
-        public static final int menu_screen_on_off=0x7f0600a9;
-        public static final int menu_search=0x7f060067;
-        public static final int menu_settings=0x7f06006b;
-        public static final int menu_show_album=0x7f0600aa;
-        public static final int menu_shuffle=0x7f0600ad;
-        public static final int notification_image=0x7f06006f;
-        public static final int now_playing=0x7f060074;
-        public static final int now_playing_artist=0x7f060077;
-        public static final int now_playing_control_play=0x7f060078;
-        public static final int now_playing_image=0x7f060075;
-        public static final int now_playing_trackname=0x7f060076;
-        public static final int play_video_contents=0x7f060079;
-        public static final int progress_message=0x7f06007a;
+        public static final int menu_browse=0x7f060067;
+        public static final int menu_common=0x7f06006b;
+        public static final int menu_exit=0x7f06006e;
+        public static final int menu_home=0x7f060066;
+        public static final int menu_lyrics=0x7f0600ac;
+        public static final int menu_main=0x7f060064;
+        public static final int menu_navigation=0x7f060065;
+        public static final int menu_now_playing=0x7f06006a;
+        public static final int menu_playlists=0x7f060069;
+        public static final int menu_remove=0x7f0600ad;
+        public static final int menu_remove_all=0x7f0600a9;
+        public static final int menu_save_playlist=0x7f0600a8;
+        public static final int menu_screen_on_off=0x7f0600aa;
+        public static final int menu_search=0x7f060068;
+        public static final int menu_settings=0x7f06006c;
+        public static final int menu_show_album=0x7f0600ab;
+        public static final int menu_shuffle=0x7f0600ae;
+        public static final int notification_image=0x7f060070;
+        public static final int now_playing=0x7f060075;
+        public static final int now_playing_artist=0x7f060078;
+        public static final int now_playing_control_play=0x7f060079;
+        public static final int now_playing_image=0x7f060076;
+        public static final int now_playing_trackname=0x7f060077;
+        public static final int play_video_contents=0x7f06007a;
+        public static final int progress_message=0x7f06007b;
         public static final int pullDownFromTop=0x7f060005;
         public static final int pullFromEnd=0x7f060002;
         public static final int pullFromStart=0x7f060001;
         public static final int pullUpFromBottom=0x7f060006;
-        public static final int pull_to_refresh_image=0x7f06007c;
-        public static final int pull_to_refresh_progress=0x7f06007d;
-        public static final int pull_to_refresh_sub_text=0x7f06007f;
-        public static final int pull_to_refresh_text=0x7f06007e;
+        public static final int pull_to_refresh_image=0x7f06007d;
+        public static final int pull_to_refresh_progress=0x7f06007e;
+        public static final int pull_to_refresh_sub_text=0x7f060080;
+        public static final int pull_to_refresh_text=0x7f06007f;
         public static final int rotate=0x7f060007;
-        public static final int save_playlist_name=0x7f060081;
-        public static final int save_playlist_root=0x7f060080;
+        public static final int save_playlist_name=0x7f060082;
+        public static final int save_playlist_root=0x7f060081;
         public static final int scrollview=0x7f06000b;
-        public static final int search_albums=0x7f060085;
-        public static final int search_artists=0x7f060084;
-        public static final int search_list=0x7f060082;
-        public static final int search_more_albums=0x7f060088;
-        public static final int search_more_artists=0x7f060087;
-        public static final int search_more_songs=0x7f060089;
-        public static final int search_search=0x7f060083;
-        public static final int search_songs=0x7f060086;
-        public static final int select_album_art=0x7f06008c;
-        public static final int select_album_artist=0x7f06008e;
-        public static final int select_album_delete=0x7f060018;
-        public static final int select_album_duration=0x7f060091;
-        public static final int select_album_empty=0x7f06008a;
-        public static final int select_album_entries=0x7f06008b;
-        public static final int select_album_genre=0x7f06008f;
-        public static final int select_album_more=0x7f060019;
-        public static final int select_album_pin=0x7f060016;
-        public static final int select_album_play_all=0x7f0600ae;
-        public static final int select_album_play_last=0x7f060015;
+        public static final int search_albums=0x7f060086;
+        public static final int search_artists=0x7f060085;
+        public static final int search_list=0x7f060083;
+        public static final int search_more_albums=0x7f060089;
+        public static final int search_more_artists=0x7f060088;
+        public static final int search_more_songs=0x7f06008a;
+        public static final int search_search=0x7f060084;
+        public static final int search_songs=0x7f060087;
+        public static final int select_album_art=0x7f06008d;
+        public static final int select_album_artist=0x7f06008f;
+        public static final int select_album_delete=0x7f060019;
+        public static final int select_album_duration=0x7f060092;
+        public static final int select_album_empty=0x7f06008b;
+        public static final int select_album_entries=0x7f06008c;
+        public static final int select_album_genre=0x7f060090;
+        public static final int select_album_more=0x7f06001a;
+        public static final int select_album_pin=0x7f060017;
+        public static final int select_album_play_all=0x7f0600af;
+        public static final int select_album_play_last=0x7f060016;
+        public static final int select_album_play_next=0x7f060015;
         public static final int select_album_play_now=0x7f060014;
         public static final int select_album_select=0x7f060013;
-        public static final int select_album_song_count=0x7f060090;
-        public static final int select_album_title=0x7f06008d;
-        public static final int select_album_unpin=0x7f060017;
-        public static final int select_artist_folder=0x7f060093;
-        public static final int select_artist_folder_1=0x7f060094;
-        public static final int select_artist_folder_2=0x7f060095;
-        public static final int select_artist_list=0x7f060092;
-        public static final int select_genre_empty=0x7f060096;
-        public static final int select_genre_list=0x7f060097;
-        public static final int select_playlist_empty=0x7f060098;
-        public static final int select_playlist_list=0x7f060099;
-        public static final int song_artist=0x7f06009e;
-        public static final int song_check=0x7f06009a;
-        public static final int song_duration=0x7f06009f;
-        public static final int song_menu_play_last=0x7f0600b7;
-        public static final int song_menu_play_next=0x7f0600b6;
-        public static final int song_menu_play_now=0x7f0600b5;
-        public static final int song_star=0x7f0600a0;
-        public static final int song_status=0x7f06009d;
-        public static final int song_title=0x7f06009c;
-        public static final int song_track=0x7f06009b;
-        public static final int status_icon=0x7f060070;
-        public static final int statusbar=0x7f06006e;
-        public static final int tab_progress=0x7f0600a1;
-        public static final int tab_progress_message=0x7f0600a2;
-        public static final int title=0x7f060021;
-        public static final int toast_layout_root=0x7f060048;
-        public static final int trackname=0x7f060071;
+        public static final int select_album_song_count=0x7f060091;
+        public static final int select_album_title=0x7f06008e;
+        public static final int select_album_unpin=0x7f060018;
+        public static final int select_artist_folder=0x7f060094;
+        public static final int select_artist_folder_1=0x7f060095;
+        public static final int select_artist_folder_2=0x7f060096;
+        public static final int select_artist_list=0x7f060093;
+        public static final int select_genre_empty=0x7f060097;
+        public static final int select_genre_list=0x7f060098;
+        public static final int select_playlist_empty=0x7f060099;
+        public static final int select_playlist_list=0x7f06009a;
+        public static final int song_artist=0x7f06009f;
+        public static final int song_check=0x7f06009b;
+        public static final int song_duration=0x7f0600a0;
+        public static final int song_star=0x7f0600a1;
+        public static final int song_status=0x7f06009e;
+        public static final int song_title=0x7f06009d;
+        public static final int song_track=0x7f06009c;
+        public static final int status_icon=0x7f060071;
+        public static final int statusbar=0x7f06006f;
+        public static final int tab_progress=0x7f0600a2;
+        public static final int tab_progress_message=0x7f0600a3;
+        public static final int title=0x7f060022;
+        public static final int toast_layout_root=0x7f060049;
+        public static final int trackname=0x7f060072;
         public static final int webview=0x7f06000a;
     }
     public static final class integer {
@@ -809,7 +819,6 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
         public static final int select_album=0x7f0e0003;
         public static final int select_album_context=0x7f0e0004;
         public static final int select_artist_context=0x7f0e0005;
-        public static final int select_song_context=0x7f0e0006;
     }
     public static final class plurals {
         public static final int select_album_donate_dialog_n_trial_days_left=0x7f0d0003;
diff --git a/res/drawable-xhdpi/media_play_next_dark.png b/res/drawable-xhdpi/media_play_next_dark.png
new file mode 100644
index 00000000..6d2bfb68
Binary files /dev/null and b/res/drawable-xhdpi/media_play_next_dark.png differ
diff --git a/res/drawable-xhdpi/media_play_next_light.png b/res/drawable-xhdpi/media_play_next_light.png
new file mode 100644
index 00000000..9ffd6b9a
Binary files /dev/null and b/res/drawable-xhdpi/media_play_next_light.png differ
diff --git a/res/drawable-xhdpi/media_play_now_dark.png b/res/drawable-xhdpi/media_play_now_dark.png
new file mode 100644
index 00000000..e53d5eb1
Binary files /dev/null and b/res/drawable-xhdpi/media_play_now_dark.png differ
diff --git a/res/drawable-xhdpi/media_play_now_light.png b/res/drawable-xhdpi/media_play_now_light.png
new file mode 100644
index 00000000..d527454c
Binary files /dev/null and b/res/drawable-xhdpi/media_play_now_light.png differ
diff --git a/res/layout/album_buttons.xml b/res/layout/album_buttons.xml
index 96e6a128..cc6cdf12 100644
--- a/res/layout/album_buttons.xml
+++ b/res/layout/album_buttons.xml
@@ -19,8 +19,16 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:src="?attr/media_play"
+        android:src="?attr/media_play_now"
         android:visibility="gone" />
+    
+    <ImageView
+        android:id="@+id/select_album_play_next"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:src="?attr/media_play_next"
+        android:visibility="gone" />    
 
     <ImageView
         android:id="@+id/select_album_play_last"
diff --git a/res/menu/select_song_context.xml b/res/menu/select_song_context.xml
deleted file mode 100644
index ce0707c0..00000000
--- a/res/menu/select_song_context.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:a="http://schemas.android.com/apk/res/android">
-
-    <item 
-        a:id="@+id/song_menu_play_now"
-        a:title="@string/common.play_now"
-        />
-
-    <item 
-        a:id="@+id/song_menu_play_next"
-        a:title="@string/common.play_next"
-        />
-
-    <item 
-        a:id="@+id/song_menu_play_last"
-        a:title="@string/common.play_last"
-        />
-        
-</menu>
\ No newline at end of file
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
deleted file mode 100644
index 42ce59d0..00000000
--- a/res/values-de/strings.xml
+++ /dev/null
@@ -1,301 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="common.appname">UltraSonic</string>
-    <string name="common.ok">OK</string>
-    <string name="common.save">Sparen</string>
-    <string name="common.cancel">Annullieren</string>
-	<string name="common.play_now">Jetzt spielen</string>
-	<string name="common.play_next">Spielen nächsten</string>
-	<string name="common.play_last">Spielen letzte</string>
-	<string name="common.pin">Befestigen</string>
-	<string name="common.unpin">Trennen</string>
-	<string name="common.delete">Löschen</string>
-	<string name="common.various_artists">Verschiedenen Künstlern</string>
-	<string name="common.multiple_genres">Mehrere Genres</string>
-    <string name="button_bar.home">Startseite UltraSonic</string>
-    <string name="button_bar.browse">Musikbibliothek</string>
-    <string name="button_bar.search">Suche</string>
-    <string name="button_bar.playlists">Wiedergabelisten</string>
-    <string name="button_bar.now_playing">Spielt jetzt</string>
-    <string name="main.welcome_title">Willkommen!</string>
-    <string name="main.welcome_text">Willkommen UltraSonic! Die Anwendung ist nicht konfiguriert. Nachdem Sie Ihren eigenen Server (ab <b>subsonic.org</b>), bitte auf die Einstellungen zugreifen und die <b>Konfiguration</b> ändern, um eine Verbindung herzustellen.</string>
-    <string name="main.select_server">Wählen Sie einen Server</string>
-    <string name="main.select_genre">Genre wählen</string>
-    <string name="main.select_all_genres">Alle Genres</string>
-    <string name="main.shuffle">Shuffle</string>
-    <string name="main.offline">Offline</string>
-    <string name="main.settings">Einstellungen</string>
-	<string name="main.artists_title">Künstler</string>
-    <string name="main.genres_title">Genres</string>
-    <string name="main.albums_title">Alben</string>
-    <string name="main.albums_newest">Neueste</string>
-	<string name="main.albums_recent">Kürzlich gespielt</string>	
-	<string name="main.albums_frequent">Häufig gespielt</string>	
-	<string name="main.albums_highest">Höchsten bewertet</string>
-    <string name="main.albums_random">Zufällig</string>
-    <string name="main.albums_starred">Gefällt</string>
-    <string name="main.albums_alphaByName">Alphabetisch nach Namen</string>
-    <string name="main.albums_alphaByArtist">Alphabetisch nach Künstler</string>
-	<string name="main.songs_title">Lieder</string>
-    <string name="main.songs_starred">Gefällt</string>
-    <string name="main.songs_random">Zufällig</string>
-    <string name="main.songs_genre">Genre</string>
-    <string name="main.music">Musik</string>
-    <string name="menu.exit">Verlassen</string>
-    <string name="menu.settings">Einstellungen</string>
-    <string name="menu.help">Hilfe</string>
-    <string name="menu.about">Über</string>    
-    <string name="menu.search">Suche</string>	
-    <string name="menu.navigation">Navigation</string>
-	<string name="menu.common">Gemeinsamen</string>  
-    <string name="playlist.label">Wiedergabelisten</string>
-    <string name="help.label">Hilfe</string>
-    <string name="help.title">Willkommen UltraSonic!</string>
-    <string name="help.back">Rückkehr</string>
-    <string name="help.close">Schließen</string>
-    <string name="help.url">file:///android_asset/html/en/index.html</string>
-    <string name="help.loading">Verladung&#8230;</string>
-    <string name="play_video.loading">Laden Sie das Video&#8230;</string>
-	<string name="play_video.noplugin">Bitte installieren Sie den Adobe Flash Player aus dem Google Play Store.</string>
-    <string name="search.label">Suche</string>
-    <string name="search.title">Suche</string>
-    <string name="search.search">Klicken Sie auf Suche</string>
-    <string name="search.no_match">Keine Ergebnisse, bitte versuchen Sie es erneut</string>
-    <string name="search.artists">Künstler</string>
-    <string name="search.albums">Alben</string>
-    <string name="search.songs">Lieder</string>
-    <string name="search.more">Mehr anzeigen</string>
-    <string name="progress.wait">Bitte warten&#8230;</string>
-    <string name="music_library.label">Musikbibliothek</string>
-    <string name="music_library.label_offline">Musik offline</string>
-    <string name="select_album.empty">Keine Titel gefunden</string>
-    <string name="select_album.select">Wählen Sie alle</string>
-    <string name="select_album.n_selected">%d Ausgewählte Titel.</string>
-    <string name="select_album.n_unselected">%d Nicht ausgewählte Titel.</string>
-    <string name="select_album.more">Mehr</string>
-    <string name="select_album.offline">Offline</string>
-    <string name="select_album.searching">Suchen&#8230;</string>
-    <string name="select_album.play_all">Spielen</string>	
-    <string name="select_album.no_sdcard">Fehler: Keine SD-Karte erhältlich.</string>
-    <string name="select_album.no_network">Hinweis: Kein Netz verfügbar.</string>
-    <string name="select_album.not_licensed">Server ohne Lizenz. %d Studie verbleibenden Tage.</string>
-    <string name="select_album.donate_dialog_message">Holen Sie sich unbegrenzte Downloads mit einer Spende Subsonic.</string>
-    <string name="select_album.donate_dialog_now">Jetzt</string>
-    <string name="select_album.donate_dialog_later">Später</string>
-    <string name="select_album.donate_dialog_0_trial_days_left">Die Probezeit ist vorbei</string>
-    <string name="select_artist.empty">Keine Künstler gefunden</string>
-    <string name="select_genre.empty">Keine Genres gefunden</string>
-    <string name="select_playlist.empty">Keine Playlist auf dem Server</string>
-    <string name="download.empty">Leere Wiedergabeliste</string>
-    <string name="download.playerstate_downloading">Herunterladen - %s</string>
-    <string name="download.playerstate_buffering">Speichern</string>
-    <string name="download.playerstate_playing_shuffle">Nach Zufallswiedergabe</string>
-    <string name="download.menu_show_album">Zeigen Album</string>
-    <string name="download.menu_lyrics">Songtext</string>
-    <string name="download.menu_remove">Entfernen verfolgen</string>
-    <string name="download.menu_remove_all">Entfernen Sie alle</string>
-    <string name="download.menu_screen_on">Auf dem Bildschirm</string>
-    <string name="download.menu_screen_off">Deaktivieren Bildschirm</string>
-    <string name="download.menu_shuffle">Shuffle</string>
-    <string name="download.menu_save">Speichern Sie die Playlist</string>
-	<string name="download.menu_equalizer">Equalizer</string>	
-    <string name="download.menu_visualizer">Visualizer</string>	
-    <string name="download.menu_jukebox">Jukebox</string>	
-    <string name="download.menu_shuffle_notification">Playlist gemischten</string>
-    <string name="download.playlist_title">Speichern Sie die Playlist</string>
-    <string name="download.playlist_name">Geben Sie den Namen der Wiedergabeliste :</string>
-    <string name="download.playlist_saving">Aufnahme Playlist \"%s\"&#8230;</string>
-    <string name="download.playlist_done">Playlist erfolgreich registriert!</string>
-    <string name="download.playlist_error">Konnte die Wiedergabeliste zu speichern, bitte versuchen Sie es später erneut.</string>
-    <string name="download.repeat_off">Wiederholung aus</string>
-    <string name="download.repeat_all">Alle wiederholen</string>
-    <string name="download.repeat_single">Wiederholen Song</string>
-    <string name="download.visualizer_on">Viewer-aktivierten</string>
-    <string name="download.visualizer_off">Viewers deaktiviert</string>
-	<string name="download.jukebox_on">Fernbedienung aktiviert. Die Musik wird auf dem Server gespielt.</string>
-    <string name="download.jukebox_off">Fernbedienung deaktiviert. Die Musik wird auf dem Handy gespielt.</string>
-    <string name="download.jukebox_volume">Volumen des entfernten</string>
-    <string name="download.jukebox_server_too_old">Die Fernbedienung wird nicht unterstützt. Update-Subsonic-Server benötigt.</string>
-    <string name="download.jukebox_offline">Die Fernbedienung ist nicht offline verfügbar.</string>
-    <string name="download.jukebox_not_authorized">Die Fernbedienung ist nicht erlaubt. Bitte aktivieren Jukebox-Modus in <b>Benutzer &gt; Einstellungen</b> von Ihrem Subsonic Server.</string>
-	<string name="song_details.all">%1$s%2$s</string>
-    <string name="song_details.kbps">%d Kb/s</string>
-    <string name="lyrics.nomatch">Keine Songtexte gefunden</string>
-    <string name="error.label">Fehler</string>
-    <string name="settings.title">UltraSonic von Parametern</string>
-    <string name="settings.test_connection_title">Test Connection</string>
-    <string name="settings.servers_title">Server</string>
-    <string name="settings.server_unused1">Ungenutzte 1</string>
-    <string name="settings.server_unused2">Ungenutzte 2</string>
-	<string name="settings.server_unused3">Ungenutzte 3</string>
-    <string name="settings.server_name">Name</string>
-    <string name="settings.server_address">Server-Adresse</string>
-    <string name="settings.server_username">Benutzername</string>
-    <string name="settings.server_password">Kennwort</string>
-    <string name="settings.cache_title">Cache Musik</string>
-    <string name="settings.preload">Songs Vorspannung</string>
-    <string name="settings.cache_size">Cache-Größe</string>
-    <string name="settings.cache_location">Cache-Speicherort</string>
-    <string name="settings.cache_location_error">Ort der ungültigen Cache. Mit Standard.</string>	
-    <string name="settings.testing_connection">Anschließen Test&#8230;</string>
-    <string name="settings.testing_ok">Richtiger Anschluss</string>
-    <string name="settings.testing_unlicensed">Korrekter Anschluss. Server ohne Lizenz.</string>
-    <string name="settings.connection_failure">Verbindung fehlgeschlagen</string>
-    <string name="settings.invalid_url">Bitte geben Sie eine gültige URL.</string>
-    <string name="settings.invalid_username">Bitte geben Sie einen gültigen Benutzernamen (keine Leerzeichen am Ende).</string>
-    <string name="settings.appearance_title">Aussehen</string>
-    <string name="settings.theme_title">Thema</string>
-    <string name="settings.theme_light">Helle</string>
-    <string name="settings.theme_dark">Dunkle</string>
-    <string name="settings.network_title">Netzwerk</string>
-    <string name="settings.max_bitrate_wifi">Maximaler Durchfluss - Wi-Fi</string>
-    <string name="settings.max_bitrate_mobile">Maximaler Durchfluss - Mobile</string>
-    <string name="settings.max_bitrate_32">32 Kb/s</string>
-    <string name="settings.max_bitrate_64">64 Kb/s</string>
-    <string name="settings.max_bitrate_80">80 Kb/s</string>
-    <string name="settings.max_bitrate_96">96 Kb/s</string>
-    <string name="settings.max_bitrate_112">112 Kb/s</string>
-    <string name="settings.max_bitrate_128">128 Kb/s</string>
-    <string name="settings.max_bitrate_160">160 Kb/s</string>
-    <string name="settings.max_bitrate_192">192 Kb/s</string>
-    <string name="settings.max_bitrate_256">256 Kb/s</string>
-    <string name="settings.max_bitrate_320">320 Kb/s</string>
-    <string name="settings.max_bitrate_unlimited">Unbegrenzt</string>
-	<string name="settings.wifi_required_title">Wi-Fi-Streaming nur</string>
-    <string name="settings.wifi_required_summary">Nur Stream-Medien, wenn Wi-Fi verbunden</string>
-    <string name="settings.display_bitrate">Sehen Bitrate und Dateiendung</string>
-    <string name="settings.display_bitrate_summary">Fügen Sie den Namen des Künstlers, Bitrate und Dateiendung</string>
-    <string name="settings.use_folder_for_album_artist">Verwenden Sie Ordner, um die Namen von Interpreten</string>
-    <string name="settings.use_folder_for_album_artist_summary">Top-Level-Ordner ist der Name des Albums, Künstler</string>
-    <string name="settings.show_track_number">Zeigen Track-Nummer</string>
-    <string name="settings.show_track_number_summary">Fügen Sie die Nummer im Display Titel</string>
-    <string name="settings.preload_1">1 Stück</string>
-    <string name="settings.preload_2">2 Stücke</string>
-    <string name="settings.preload_3">3 Stücke</string>
-    <string name="settings.preload_5">5 Stücke</string>
-    <string name="settings.preload_10">10 Stücke</string>
-    <string name="settings.preload_unlimited">Unbegrenzt</string>
-    <string name="settings.cache_size_100">100 MB</string>
-    <string name="settings.cache_size_200">200 MB</string>
-    <string name="settings.cache_size_500">500 Mb</string>
-    <string name="settings.cache_size_1000">1 GB</string>
-    <string name="settings.cache_size_2000">2 GB</string>
-    <string name="settings.cache_size_5000">5 GB</string>
-    <string name="settings.cache_size_10000">10 GB</string>
-    <string name="settings.cache_size_20000">20 GB</string>
-    <string name="settings.cache_size_unlimited">Unbegrenzt</string>
-    <string name="settings.clear_search_history">Suchverlauf löschen</string>
-    <string name="settings.search_history_cleared">Suchverlauf gelöscht</string>
-    <string name="settings.other_title">Andere Parameter</string>
-    <string name="settings.search_title">Sucheinstellungen</string>
-    <string name="settings.playback_control_title">Wiedergabe-Steuerung</string>
-    <string name="settings.scrobble_title">Scrobble auf Last.fm</string>
-    <string name="settings.scrobble_summary">Vergessen Sie nicht, Ihren Benutzernamen und Ihr Passwort auf Last.fm Subsonic-Server eingerichtet</string>
-    <string name="settings.server_scaling_title">Server-Side-Albumcover Skalierung</string>
-    <string name="settings.server_scaling_summary">Laden skalierte Bilder vom Server statt voller Größe (spart Bandbreite)</string>
-    <string name="settings.hide_media_title">Ausblenden andere</string>
-    <string name="settings.hide_media_summary">Ausblenden Musikdateien und Albumcover anderen Apps (Galerie, Musik, etc.)</string>
-    <string name="settings.hide_media_toast">Wirksamwerden nächsten Android scannt Ihr Handy für Musik.</string>
-    <string name="settings.media_button_title">Medien-Tasten</string>
-    <string name="settings.media_button_summary">Reagieren Sie auf Telefon, Headset und Bluetooth-Media-Tasten</string>
-    <string name="settings.screen_lit_title">Halten Sie überwachen auf</string>
-    <string name="settings.screen_lit_summary">Halten Sie den Bildschirm auf, während das Herunterladen Verbessert Download-Geschwindigkeit.</string>
-    <string name="settings.buffer_length">Buffer Länge</string>
-    <string name="settings.network_timeout">Verbindungs-Timeout</string>
-    <string name="settings.buffer_length_1">1 Sekunde</string>
-    <string name="settings.buffer_length_2">2 Sekunden</string>
-    <string name="settings.buffer_length_5">5 Sekunden</string>
-    <string name="settings.buffer_length_8">8 Sekunden</string>
-    <string name="settings.buffer_length_10">10 Sekunden</string>
-    <string name="settings.buffer_length_12">12 Sekunden</string>
-    <string name="settings.buffer_length_15">15 Sekunden</string>
-    <string name="settings.buffer_length_20">20 Sekunden</string>
-    <string name="settings.buffer_length_30">30 Sekunden</string>
-    <string name="settings.network_timeout_15000">15 Sekunden</string>
-    <string name="settings.network_timeout_30000">30 Sekunden</string>
-    <string name="settings.network_timeout_45000">45 Sekunden</string>
-    <string name="settings.network_timeout_60000">60 Sekunden</string>
-    <string name="settings.network_timeout_75000">75 Sekunden</string>
-    <string name="settings.network_timeout_90000">90 Sekunden</string>
-    <string name="settings.network_timeout_105000">105 Sekunden</string>
-    <string name="settings.network_timeout_120000">120 Sekunden</string>
-    <string name="settings.show_notification">Benachrichtigungen</string>
-    <string name="settings.show_notification_summary">Show jetzt spielen Benachrichtigung in der Statusleiste</string>
-    <string name="settings.show_notification_always">Immer zeigen Meldungen</string>
-    <string name="settings.show_notification_always_summary">Zeigen immer spielen jetzt Benachrichtigung, wenn eine Wiedergabeliste wird aufgefüllt</string>
-    <string name="settings.show_lockscreen_controls">Bedienelemente am Bildschirm sperren</string>
-    <string name="settings.show_lockscreen_controls_summary">Zeigen Sie die Steuerelemente für die Wiedergabe auf dem Bildschirm sperren</string>
-    <string name="settings.use_stream_proxy">Verwenden Sie einen Proxy</string>
-    <string name="settings.use_stream_proxy_summary">Stream-Medien über einen Proxy-Wiedergabe (stottern kann helfen)</string>
-    <string name="settings.show_now_playing">Jetzt zeigen abgespielten Song</string>
-    <string name="settings.show_now_playing_summary">Anzeigen aktuellen Titels in allen Aktivitäten</string>    
-    <string name="settings.max_albums">Maximale Alben</string>
-    <string name="settings.search_1">1</string>
-    <string name="settings.search_3">3</string>
-    <string name="settings.search_5">5</string>
-    <string name="settings.search_10">10</string>
-    <string name="settings.search_15">15</string>
-    <string name="settings.search_20">20</string>
-    <string name="settings.search_25">25</string>
-    <string name="settings.search_30">30</string>
-    <string name="settings.search_40">40</string>
-    <string name="settings.search_50">50</string>
-    <string name="settings.search_75">75</string>
-    <string name="settings.search_100">100</string>
-    <string name="settings.search_250">250</string>
-    <string name="settings.search_500">500</string>
-    <string name="settings.max_artists">Maximale Künstler</string>
-    <string name="settings.max_songs">Maximale Songs</string>
-    <string name="settings.default_artists">Standardmäßig Künstler</string>
-    <string name="settings.default_albums">Standardmäßig Alben</string>
-    <string name="settings.default_songs">Standardmäßig Songs</string>	
-    <string name="music_service.retry">Ein Netzwerk-Fehler aufgetreten. Führen Sie %1$d von %2$d.</string>
-    <string name="background_task.wait">Bitte warten&#8230;</string>
-    <string name="background_task.loading">Verladung&#8230;</string>
-    <string name="background_task.no_network">Diese Anwendung erfordert Netzzugang. Bitte schalten Sie Wi-Fi-oder Mobilfunknetz.</string>
-    <string name="background_task.network_error">Ein Netzwerk-Fehler aufgetreten. Bitte überprüfen Sie die Server-Adresse oder versuchen Sie es später erneut.</string>
-    <string name="background_task.not_found">Ressource nicht gefunden. Bitte überprüfen Sie die Adresse des Servers.</string>
-    <string name="background_task.parse_error">Falsche Antwort. Bitte überprüfen Sie die Adresse des Servers.</string>
-    <string name="service.connecting">Kontaktiert Server, bitte warten.</string>
-    <string name="parser.reading">Lesen Server.</string>
-    <string name="parser.reading_done">Lesen Server. Fertig!</string>
-    <string name="parser.upgrade_client">Inkompatible Versionen. Bitte aktualisiert die Android Anwendung im UltraSonic.</string>
-    <string name="parser.upgrade_server">Inkompatible Versionen. Bitte aktualisieren Sie die Subsonic Server.</string>
-    <string name="parser.not_authenticated">Bad Benutzername oder Passwort.</string>
-    <string name="parser.not_authorized">Unauthorized. Überprüfen Sie die Berechtigungen der Benutzer in der Subsonic Server.</string>	
-    <string name="parser.artist_count">%d erholt Künstler.</string>
-    <string name="select_artist.refresh">Erfrischen</string>
-    <string name="select_artist.folder">Wählen Sie den Ordner</string>
-    <string name="select_artist.all_folders">Alle Ordner</string>
-    <string name="equalizer.label">Equalizer</string>
-    <string name="equalizer.enabled">Aktiviert</string>
-    <string name="equalizer.preset">Vordefinierte Auswahl</string>	
-	<string name="widget.initial_text">Tippen Sie einen Titel wählen</string>
-	<string name="widget.sdcard_busy">SD-Karte nicht verfügbar</string>
-    <string name="widget.sdcard_missing">Keine SD-Karte</string>
-    <string name="util.bytes_format.gigabyte">0.00 GB</string>
-    <string name="util.bytes_format.megabyte">0.00 MB</string>
-    <string name="util.bytes_format.kilobyte">0 KB</string>
-    <string name="util.bytes_format.byte">0 B</string>
-    <string name="util.no_time">-:--</string>
-    <string name="util.zero_time">0:00</string>
-
-    <plurals name="select_album_n_songs">
-        <item quantity="zero">Keine Songs</item>
-        <item quantity="one">Ein Song</item>
-        <item quantity="other">%d Songs</item>
-    </plurals>
-    <plurals name="select_album_n_songs_downloading">
-        <item quantity="one">1 Song zum Download geplant.</item>
-        <item quantity="other">%d Songs zum Download geplant.</item>
-    </plurals>
-    <plurals name="select_album_n_songs_added">
-        <item quantity="one">Ein Song aufgenommen in die Warteschlange zu spielen.</item>
-        <item quantity="other">%d Songs aufgenommen in die Warteschlange zu spielen.</item>
-    </plurals>
-    <plurals name="select_album_donate_dialog_n_trial_days_left">
-        <item quantity="one">Ein Tag verließ der Probezeit</item>
-        <item quantity="other">%d Tage der Probezeit verlassen</item>
-    </plurals>
-
-</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 9aab3984..3d956597 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -76,6 +76,8 @@
 	<attr name="media_repeat_single" format="reference"/>
 	<attr name="media_shuffle" format="reference"/>
 	<attr name="media_play" format="reference"/>
+	<attr name="media_play_now" format="reference"/>
+	<attr name="media_play_next" format="reference"/>
 	<attr name="media_play_small" format="reference"/>
 	<attr name="media_stop" format="reference"/>
 	<attr name="media_toggle" format="reference"/>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index c6e6e5cd..fde58e81 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -32,6 +32,8 @@
         <item name="media_repeat_single">@drawable/media_repeat_single</item>
         <item name="media_shuffle">@drawable/media_shuffle_normal_dark</item>
         <item name="media_play">@drawable/media_start_normal_dark</item>
+        <item name="media_play_now">@drawable/media_play_now_dark</item>        
+        <item name="media_play_next">@drawable/media_play_next_dark</item>
         <item name="media_play_small">@drawable/ic_stat_play_dark</item>        
         <item name="media_stop">@drawable/media_stop_normal_dark</item>
         <item name="media_toggle">@drawable/media_toggle_list_normal_dark</item>
@@ -68,6 +70,8 @@
         <item name="media_repeat_single">@drawable/media_repeat_single</item>
         <item name="media_shuffle">@drawable/media_shuffle_normal_light</item>
         <item name="media_play">@drawable/media_start_normal_light</item>
+        <item name="media_play_now">@drawable/media_play_now_light</item>
+        <item name="media_play_next">@drawable/media_play_next_light</item>        
         <item name="media_play_small">@drawable/ic_stat_play_light</item>        
         <item name="media_stop">@drawable/media_stop_normal_light</item>
         <item name="media_toggle">@drawable/media_toggle_list_normal_light</item>
diff --git a/src/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java b/src/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java
index b66b2a7f..f17d9128 100644
--- a/src/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java
+++ b/src/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java
@@ -176,9 +176,6 @@ public class SearchActivity extends SubsonicTabActivity {
         if (isArtist || isAlbum) {
             MenuInflater inflater = getMenuInflater();
             inflater.inflate(R.menu.select_album_context, menu);
-        } else if (isSong) {
-            MenuInflater inflater = getMenuInflater();
-            inflater.inflate(R.menu.select_song_context, menu);
         }
     }
 
@@ -201,15 +198,6 @@ public class SearchActivity extends SubsonicTabActivity {
             case R.id.album_menu_pin:
                 downloadRecursively(id, true, true, false);
                 break;
-            case R.id.song_menu_play_now:
-                onSongSelected(entry, false, false, true, false);
-                break;
-            case R.id.song_menu_play_next:
-                onSongSelected(entry, false, true, false, true);
-                break;
-            case R.id.song_menu_play_last:
-                onSongSelected(entry, false, true, false, false);
-                break;
             default:
                 return super.onContextItemSelected(menuItem);
         }
diff --git a/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java b/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java
index 98150a07..ab186ad5 100644
--- a/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java
+++ b/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java
@@ -69,6 +69,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
     private View emptyView;
     private ImageView selectButton;
     private ImageView playNowButton;
+    private ImageView playNextButton;    
     private ImageView playLastButton;
     private ImageView pinButton;
     private ImageView unpinButton;
@@ -124,6 +125,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
 
         selectButton = (ImageView) findViewById(R.id.select_album_select);
         playNowButton = (ImageView) findViewById(R.id.select_album_play_now);
+        playNextButton = (ImageView) findViewById(R.id.select_album_play_next);
         playLastButton = (ImageView) findViewById(R.id.select_album_play_last);
         pinButton = (ImageView) findViewById(R.id.select_album_pin);
         unpinButton = (ImageView) findViewById(R.id.select_album_unpin);
@@ -144,6 +146,13 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
                 selectAll(false, false);
             }
         });
+        playNextButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                download(true, false, false, true);
+                selectAll(false, false);
+            }
+        });
         playLastButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -262,9 +271,6 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
         if (entry.isDirectory()) {
             MenuInflater inflater = getMenuInflater();
             inflater.inflate(R.menu.select_album_context, menu);
-        } else {
-            MenuInflater inflater = getMenuInflater();
-            inflater.inflate(R.menu.select_song_context, menu);
         }
     }
 
@@ -284,15 +290,6 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
             case R.id.album_menu_pin:
                 downloadRecursively(entry.getId(), true, true, false);
                 break;
-            case R.id.song_menu_play_now:
-                getDownloadService().download(songs, false, true, true);
-                break;
-            case R.id.song_menu_play_next:
-                getDownloadService().download(songs, false, false, true);
-                break;
-            case R.id.song_menu_play_last:
-                getDownloadService().download(songs, false, false, false);
-                break;
             case R.id.select_album_play_all:
             	playAll();
             	break;
@@ -509,6 +506,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
         }
         
         playNowButton.setVisibility(enabled ? View.VISIBLE : View.GONE);
+        playNextButton.setVisibility(enabled ? View.VISIBLE : View.GONE);
         playLastButton.setVisibility(enabled ? View.VISIBLE : View.GONE);
         pinButton.setVisibility((enabled && !Util.isOffline(this) && selection.size() > pinnedCount) ? View.VISIBLE : View.GONE);
         unpinButton.setVisibility(unpinEnabled ? View.VISIBLE : View.GONE);
@@ -676,6 +674,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
                 deleteButton.setVisibility(View.VISIBLE);
                 selectButton.setVisibility(View.VISIBLE);
                 playNowButton.setVisibility(View.VISIBLE);
+                playNextButton.setVisibility(View.VISIBLE);
                 playLastButton.setVisibility(View.VISIBLE);
                        
                 if (listSize == 0 || songCount < listSize) {
@@ -689,6 +688,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
                 deleteButton.setVisibility(View.GONE);
                 selectButton.setVisibility(View.GONE);
                 playNowButton.setVisibility(View.GONE);
+                playNextButton.setVisibility(View.VISIBLE);
                 playLastButton.setVisibility(View.GONE);
                 
                 if (listSize == 0 || result.getFirst().getChildren().size() < listSize) {
diff --git a/src/com/thejoshwa/ultrasonic/androidapp/util/AlbumView.java b/src/com/thejoshwa/ultrasonic/androidapp/util/AlbumView.java
index 237a8202..9d1d13b4 100644
--- a/src/com/thejoshwa/ultrasonic/androidapp/util/AlbumView.java
+++ b/src/com/thejoshwa/ultrasonic/androidapp/util/AlbumView.java
@@ -71,10 +71,10 @@ public class AlbumView extends LinearLayout {
             	final String id = album.getId();
             	
             	if (!isStarred) {
-					starImageView.setImageDrawable(getResources().getDrawable(R.attr.star_full));
+					starImageView.setImageDrawable(Util.getDrawableFromAttribute(getContext(), R.attr.star_full));
 					album.setStarred(true);
             	} else {
-            		starImageView.setImageDrawable(getResources().getDrawable(R.attr.star_hollow));
+            		starImageView.setImageDrawable(Util.getDrawableFromAttribute(getContext(), R.attr.star_hollow));
             		album.setStarred(false);
             	}