diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 27ef9027..8f63b6d8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -12,7 +12,7 @@
     <uses-permission a:name="android.permission.RECORD_AUDIO"/>
     <uses-permission a:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
 
-    <uses-sdk a:minSdkVersion="3" a:targetSdkVersion="15"/>
+    <uses-sdk a:minSdkVersion="4" a:targetSdkVersion="15"/>
 
     <supports-screens a:anyDensity="true" a:xlargeScreens="true" a:largeScreens="true" a:normalScreens="true" a:smallScreens="true"/>
 
@@ -97,11 +97,11 @@
             </intent-filter>
         </receiver>
 
-        <receiver a:name="net.sourceforge.subsonic.androidapp.provider.SubsonicAppWidgetProvider" >
+        <receiver a:name="net.sourceforge.subsonic.androidapp.provider.SubsonicAppWidgetProvider4x1" a:label="Subsonic (4x1)" >
             <intent-filter>
                 <action a:name="android.appwidget.action.APPWIDGET_UPDATE"/>
             </intent-filter>
-            <meta-data a:name="android.appwidget.provider" a:resource="@xml/appwidget_info"/>
+            <meta-data a:name="android.appwidget.provider" a:resource="@xml/appwidget_info_4x1"/>
         </receiver>
 
         <provider a:name="net.sourceforge.subsonic.androidapp.provider.SearchSuggestionProvider"
diff --git a/bin/MainActivity.apk b/bin/MainActivity.apk
index 16d6ce3d..fa26f2b0 100644
Binary files a/bin/MainActivity.apk and b/bin/MainActivity.apk differ
diff --git a/bin/classes.dex b/bin/classes.dex
index c95424a4..707ab52e 100644
Binary files a/bin/classes.dex and b/bin/classes.dex differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/R$color.class b/bin/classes/net/sourceforge/subsonic/androidapp/R$color.class
index b80a2269..b5849ba4 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/R$color.class and b/bin/classes/net/sourceforge/subsonic/androidapp/R$color.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/R$drawable.class b/bin/classes/net/sourceforge/subsonic/androidapp/R$drawable.class
index dc651bfd..2c972991 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/R$drawable.class and b/bin/classes/net/sourceforge/subsonic/androidapp/R$drawable.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/R$id.class b/bin/classes/net/sourceforge/subsonic/androidapp/R$id.class
index 2d421da9..a80b08e2 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/R$id.class and b/bin/classes/net/sourceforge/subsonic/androidapp/R$id.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/R$integer.class b/bin/classes/net/sourceforge/subsonic/androidapp/R$integer.class
new file mode 100644
index 00000000..e1b50f13
Binary files /dev/null and b/bin/classes/net/sourceforge/subsonic/androidapp/R$integer.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/R$layout.class b/bin/classes/net/sourceforge/subsonic/androidapp/R$layout.class
index d6fff4b6..cbfb4c0e 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/R$layout.class and b/bin/classes/net/sourceforge/subsonic/androidapp/R$layout.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/R$menu.class b/bin/classes/net/sourceforge/subsonic/androidapp/R$menu.class
index 2855e3e8..d5c41b48 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/R$menu.class and b/bin/classes/net/sourceforge/subsonic/androidapp/R$menu.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/R$plurals.class b/bin/classes/net/sourceforge/subsonic/androidapp/R$plurals.class
index 976bf5c5..fa13906d 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/R$plurals.class and b/bin/classes/net/sourceforge/subsonic/androidapp/R$plurals.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/R$string.class b/bin/classes/net/sourceforge/subsonic/androidapp/R$string.class
index 116a230e..06987ef0 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/R$string.class and b/bin/classes/net/sourceforge/subsonic/androidapp/R$string.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/R$style.class b/bin/classes/net/sourceforge/subsonic/androidapp/R$style.class
index 81566654..75c738a6 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/R$style.class and b/bin/classes/net/sourceforge/subsonic/androidapp/R$style.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/R$xml.class b/bin/classes/net/sourceforge/subsonic/androidapp/R$xml.class
index ddc4015b..b29f01db 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/R$xml.class and b/bin/classes/net/sourceforge/subsonic/androidapp/R$xml.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/R.class b/bin/classes/net/sourceforge/subsonic/androidapp/R.class
index 6f9289d1..d220aa62 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/R.class and b/bin/classes/net/sourceforge/subsonic/androidapp/R.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity$10.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity$10.class
index 6347bf8a..78443448 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity$10.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity$10.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity$12.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity$12.class
index 103bec15..6232dd04 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity$12.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity$12.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity$13.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity$13.class
index db0d3f32..4a474a4e 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity$13.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity$13.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity$21.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity$21.class
index 38bcaffe..73420940 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity$21.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity$21.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity$8.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity$8.class
index c6b3a8d4..65c96c7c 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity$8.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity$8.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.class
index cd0f1375..f0894ea5 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/EqualizerActivity.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/EqualizerActivity.class
index 4c8bc06b..3fc99832 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/EqualizerActivity.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/EqualizerActivity.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/HelpActivity$HelpClient.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/HelpActivity$HelpClient.class
index ca0008f1..246d9352 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/HelpActivity$HelpClient.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/HelpActivity$HelpClient.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/HelpActivity.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/HelpActivity.class
index 41291f2d..6738fc7c 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/HelpActivity.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/HelpActivity.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/LyricsActivity$1.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/LyricsActivity$1.class
index 0340682c..80e8ea2a 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/LyricsActivity$1.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/LyricsActivity$1.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/MainActivity.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/MainActivity.class
index 7e234b4e..7834bcfb 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/MainActivity.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/MainActivity.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/PlayVideoActivity.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/PlayVideoActivity.class
index 7ce36e53..54563cdd 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/PlayVideoActivity.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/PlayVideoActivity.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SearchActivity.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SearchActivity.class
index f02b0e2d..0ba549f4 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SearchActivity.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SearchActivity.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity$13.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity$13.class
index 46bbf318..50d75662 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity$13.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity$13.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.class
index 859f820c..63f41051 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity$3.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity$3.class
index b07ba177..b9370eb2 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity$3.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity$3.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity.class
index 2f871ef9..9e59d3bb 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectPlaylistActivity.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectPlaylistActivity.class
index b525f27c..c64ab3e5 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectPlaylistActivity.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SelectPlaylistActivity.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SettingsActivity$4.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SettingsActivity$4.class
index 2e158b26..e383c8d7 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SettingsActivity$4.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SettingsActivity$4.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SettingsActivity$5.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SettingsActivity$5.class
index 8f378ed1..0ac54443 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SettingsActivity$5.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SettingsActivity$5.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SettingsActivity$ServerSettings$1.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SettingsActivity$ServerSettings$1.class
index 9178b239..3793ff6d 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SettingsActivity$ServerSettings$1.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SettingsActivity$ServerSettings$1.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SettingsActivity$ServerSettings$2.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SettingsActivity$ServerSettings$2.class
index 6ccfb2ab..127eb929 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SettingsActivity$ServerSettings$2.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SettingsActivity$ServerSettings$2.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SettingsActivity.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SettingsActivity.class
index 276054bf..6b6cc647 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SettingsActivity.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SettingsActivity.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SubsonicTabActivity.class b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SubsonicTabActivity.class
index bf55f605..0d6299ab 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/activity/SubsonicTabActivity.class and b/bin/classes/net/sourceforge/subsonic/androidapp/activity/SubsonicTabActivity.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/provider/SubsonicAppWidgetProvider.class b/bin/classes/net/sourceforge/subsonic/androidapp/provider/SubsonicAppWidgetProvider4x1.class
similarity index 90%
rename from bin/classes/net/sourceforge/subsonic/androidapp/provider/SubsonicAppWidgetProvider.class
rename to bin/classes/net/sourceforge/subsonic/androidapp/provider/SubsonicAppWidgetProvider4x1.class
index 9bad5de5..038fa50f 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/provider/SubsonicAppWidgetProvider.class and b/bin/classes/net/sourceforge/subsonic/androidapp/provider/SubsonicAppWidgetProvider4x1.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/service/JukeboxService$VolumeToast.class b/bin/classes/net/sourceforge/subsonic/androidapp/service/JukeboxService$VolumeToast.class
index c8d8d396..f54c562d 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/service/JukeboxService$VolumeToast.class and b/bin/classes/net/sourceforge/subsonic/androidapp/service/JukeboxService$VolumeToast.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/service/JukeboxService.class b/bin/classes/net/sourceforge/subsonic/androidapp/service/JukeboxService.class
index 6a49806b..20153ace 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/service/JukeboxService.class and b/bin/classes/net/sourceforge/subsonic/androidapp/service/JukeboxService.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/service/RESTMusicService.class b/bin/classes/net/sourceforge/subsonic/androidapp/service/RESTMusicService.class
index b07881b0..41504b4d 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/service/RESTMusicService.class and b/bin/classes/net/sourceforge/subsonic/androidapp/service/RESTMusicService.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/AbstractParser.class b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/AbstractParser.class
index 518b25fc..c6cf21f2 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/AbstractParser.class and b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/AbstractParser.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/AlbumListParser.class b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/AlbumListParser.class
index ac8583b7..f94133c8 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/AlbumListParser.class and b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/AlbumListParser.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/IndexesParser.class b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/IndexesParser.class
index cbc20c3c..f6bef5b6 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/IndexesParser.class and b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/IndexesParser.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/LyricsParser.class b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/LyricsParser.class
index cea5558e..4b839d66 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/LyricsParser.class and b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/LyricsParser.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/MusicDirectoryParser.class b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/MusicDirectoryParser.class
index f4c0905d..4076727e 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/MusicDirectoryParser.class and b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/MusicDirectoryParser.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/MusicFoldersParser.class b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/MusicFoldersParser.class
index 41d5b5ca..6f689859 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/MusicFoldersParser.class and b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/MusicFoldersParser.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/PlaylistParser.class b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/PlaylistParser.class
index d7e7d04c..3b55e3a1 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/PlaylistParser.class and b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/PlaylistParser.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/PlaylistsParser.class b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/PlaylistsParser.class
index 40ababfb..00d466be 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/PlaylistsParser.class and b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/PlaylistsParser.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/RandomSongsParser.class b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/RandomSongsParser.class
index b7450a0f..e9bb7118 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/RandomSongsParser.class and b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/RandomSongsParser.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/SearchResult2Parser.class b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/SearchResult2Parser.class
index 2de5380f..f8bbf996 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/SearchResult2Parser.class and b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/SearchResult2Parser.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/SearchResultParser.class b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/SearchResultParser.class
index 9c03b598..f1397f4b 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/SearchResultParser.class and b/bin/classes/net/sourceforge/subsonic/androidapp/service/parser/SearchResultParser.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/util/AlbumView.class b/bin/classes/net/sourceforge/subsonic/androidapp/util/AlbumView.class
index ecb4ce73..fe69b34b 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/util/AlbumView.class and b/bin/classes/net/sourceforge/subsonic/androidapp/util/AlbumView.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/util/BackgroundTask.class b/bin/classes/net/sourceforge/subsonic/androidapp/util/BackgroundTask.class
index febb2954..02be8d22 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/util/BackgroundTask.class and b/bin/classes/net/sourceforge/subsonic/androidapp/util/BackgroundTask.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/util/ErrorDialog.class b/bin/classes/net/sourceforge/subsonic/androidapp/util/ErrorDialog.class
index 360680a8..ed959c84 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/util/ErrorDialog.class and b/bin/classes/net/sourceforge/subsonic/androidapp/util/ErrorDialog.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/util/HorizontalSlider.class b/bin/classes/net/sourceforge/subsonic/androidapp/util/HorizontalSlider.class
index 9c5b2174..e8993422 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/util/HorizontalSlider.class and b/bin/classes/net/sourceforge/subsonic/androidapp/util/HorizontalSlider.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/util/ModalBackgroundTask.class b/bin/classes/net/sourceforge/subsonic/androidapp/util/ModalBackgroundTask.class
index 502ae908..66f7403f 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/util/ModalBackgroundTask.class and b/bin/classes/net/sourceforge/subsonic/androidapp/util/ModalBackgroundTask.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/util/SongView.class b/bin/classes/net/sourceforge/subsonic/androidapp/util/SongView.class
index 5b42ea61..a8cc5a02 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/util/SongView.class and b/bin/classes/net/sourceforge/subsonic/androidapp/util/SongView.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/util/Util$1.class b/bin/classes/net/sourceforge/subsonic/androidapp/util/Util$1.class
index a7f85158..4a47a47c 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/util/Util$1.class and b/bin/classes/net/sourceforge/subsonic/androidapp/util/Util$1.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/util/Util$2.class b/bin/classes/net/sourceforge/subsonic/androidapp/util/Util$2.class
index d35801c2..77f52e96 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/util/Util$2.class and b/bin/classes/net/sourceforge/subsonic/androidapp/util/Util$2.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/util/Util$3.class b/bin/classes/net/sourceforge/subsonic/androidapp/util/Util$3.class
index b1ed83d2..f0824b38 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/util/Util$3.class and b/bin/classes/net/sourceforge/subsonic/androidapp/util/Util$3.class differ
diff --git a/bin/classes/net/sourceforge/subsonic/androidapp/util/Util.class b/bin/classes/net/sourceforge/subsonic/androidapp/util/Util.class
index a1bc10c7..e8745e1f 100644
Binary files a/bin/classes/net/sourceforge/subsonic/androidapp/util/Util.class and b/bin/classes/net/sourceforge/subsonic/androidapp/util/Util.class differ
diff --git a/bin/res/drawable-hdpi/action_bar_bg.9.png b/bin/res/drawable-hdpi/action_bar_bg.9.png
index c31b52aa..078db769 100644
Binary files a/bin/res/drawable-hdpi/action_bar_bg.9.png and b/bin/res/drawable-hdpi/action_bar_bg.9.png differ
diff --git a/bin/res/drawable-hdpi/bg_separator.9.png b/bin/res/drawable-hdpi/bg_separator.9.png
new file mode 100644
index 00000000..4da0e141
Binary files /dev/null and b/bin/res/drawable-hdpi/bg_separator.9.png differ
diff --git a/bin/res/drawable-hdpi/btn_collapse_group_normal_holo_dark.png b/bin/res/drawable-hdpi/btn_collapse_group_normal_holo_dark.png
new file mode 100644
index 00000000..67299dee
Binary files /dev/null and b/bin/res/drawable-hdpi/btn_collapse_group_normal_holo_dark.png differ
diff --git a/bin/res/drawable-hdpi/media_backward_normal.png b/bin/res/drawable-hdpi/media_backward_normal.png
deleted file mode 100644
index d06749bd..00000000
Binary files a/bin/res/drawable-hdpi/media_backward_normal.png and /dev/null differ
diff --git a/bin/res/drawable-hdpi/media_backward_pressed.png b/bin/res/drawable-hdpi/media_backward_pressed.png
deleted file mode 100644
index 7f0ecb90..00000000
Binary files a/bin/res/drawable-hdpi/media_backward_pressed.png and /dev/null differ
diff --git a/bin/res/drawable-hdpi/media_forward_normal.png b/bin/res/drawable-hdpi/media_forward_normal.png
deleted file mode 100644
index 2ef6ba1a..00000000
Binary files a/bin/res/drawable-hdpi/media_forward_normal.png and /dev/null differ
diff --git a/bin/res/drawable-hdpi/media_forward_pressed.png b/bin/res/drawable-hdpi/media_forward_pressed.png
deleted file mode 100644
index c6132826..00000000
Binary files a/bin/res/drawable-hdpi/media_forward_pressed.png and /dev/null differ
diff --git a/bin/res/drawable-hdpi/media_pause_normal.png b/bin/res/drawable-hdpi/media_pause_normal.png
deleted file mode 100644
index ee109f92..00000000
Binary files a/bin/res/drawable-hdpi/media_pause_normal.png and /dev/null differ
diff --git a/bin/res/drawable-hdpi/media_pause_pressed.png b/bin/res/drawable-hdpi/media_pause_pressed.png
deleted file mode 100644
index 442b32f4..00000000
Binary files a/bin/res/drawable-hdpi/media_pause_pressed.png and /dev/null differ
diff --git a/bin/res/drawable-hdpi/media_repeat_all.png b/bin/res/drawable-hdpi/media_repeat_all.png
deleted file mode 100644
index 152ef5ed..00000000
Binary files a/bin/res/drawable-hdpi/media_repeat_all.png and /dev/null differ
diff --git a/bin/res/drawable-hdpi/media_repeat_off.png b/bin/res/drawable-hdpi/media_repeat_off.png
deleted file mode 100644
index f644b083..00000000
Binary files a/bin/res/drawable-hdpi/media_repeat_off.png and /dev/null differ
diff --git a/bin/res/drawable-hdpi/media_repeat_single.png b/bin/res/drawable-hdpi/media_repeat_single.png
deleted file mode 100644
index 6202aa43..00000000
Binary files a/bin/res/drawable-hdpi/media_repeat_single.png and /dev/null differ
diff --git a/bin/res/drawable-hdpi/media_shuffle_normal.png b/bin/res/drawable-hdpi/media_shuffle_normal.png
deleted file mode 100644
index b48f77e3..00000000
Binary files a/bin/res/drawable-hdpi/media_shuffle_normal.png and /dev/null differ
diff --git a/bin/res/drawable-hdpi/media_shuffle_pressed.png b/bin/res/drawable-hdpi/media_shuffle_pressed.png
deleted file mode 100644
index 6786a329..00000000
Binary files a/bin/res/drawable-hdpi/media_shuffle_pressed.png and /dev/null differ
diff --git a/bin/res/drawable-hdpi/media_start_normal.png b/bin/res/drawable-hdpi/media_start_normal.png
deleted file mode 100644
index ed1364ff..00000000
Binary files a/bin/res/drawable-hdpi/media_start_normal.png and /dev/null differ
diff --git a/bin/res/drawable-hdpi/media_start_pressed.png b/bin/res/drawable-hdpi/media_start_pressed.png
deleted file mode 100644
index 899376ad..00000000
Binary files a/bin/res/drawable-hdpi/media_start_pressed.png and /dev/null differ
diff --git a/bin/res/drawable-hdpi/media_stop_normal.png b/bin/res/drawable-hdpi/media_stop_normal.png
deleted file mode 100644
index 8f58c4e3..00000000
Binary files a/bin/res/drawable-hdpi/media_stop_normal.png and /dev/null differ
diff --git a/bin/res/drawable-hdpi/media_stop_pressed.png b/bin/res/drawable-hdpi/media_stop_pressed.png
deleted file mode 100644
index 6483370b..00000000
Binary files a/bin/res/drawable-hdpi/media_stop_pressed.png and /dev/null differ
diff --git a/bin/res/drawable-hdpi/media_toggle_list_normal.png b/bin/res/drawable-hdpi/media_toggle_list_normal.png
deleted file mode 100644
index fb5c6686..00000000
Binary files a/bin/res/drawable-hdpi/media_toggle_list_normal.png and /dev/null differ
diff --git a/bin/res/drawable-hdpi/media_toggle_list_pressed.png b/bin/res/drawable-hdpi/media_toggle_list_pressed.png
deleted file mode 100644
index 639a62ff..00000000
Binary files a/bin/res/drawable-hdpi/media_toggle_list_pressed.png and /dev/null differ
diff --git a/bin/res/drawable-hdpi/menubar_button_disabled.9.png b/bin/res/drawable-hdpi/menubar_button_disabled.9.png
index c2a5af0e..60e18520 100644
Binary files a/bin/res/drawable-hdpi/menubar_button_disabled.9.png and b/bin/res/drawable-hdpi/menubar_button_disabled.9.png differ
diff --git a/bin/res/drawable-hdpi/menubar_button_normal.9.png b/bin/res/drawable-hdpi/menubar_button_normal.9.png
index 741e9ebf..5fc7d87f 100644
Binary files a/bin/res/drawable-hdpi/menubar_button_normal.9.png and b/bin/res/drawable-hdpi/menubar_button_normal.9.png differ
diff --git a/bin/res/drawable-hdpi/notify_panel_notification_icon_bg.png b/bin/res/drawable-hdpi/notify_panel_notification_icon_bg.png
new file mode 100644
index 00000000..5f668a58
Binary files /dev/null and b/bin/res/drawable-hdpi/notify_panel_notification_icon_bg.png differ
diff --git a/bin/res/drawable-hdpi/status_next.png b/bin/res/drawable-hdpi/status_next.png
new file mode 100644
index 00000000..5835f654
Binary files /dev/null and b/bin/res/drawable-hdpi/status_next.png differ
diff --git a/bin/res/drawable-hdpi/status_pause.png b/bin/res/drawable-hdpi/status_pause.png
new file mode 100644
index 00000000..3324f88f
Binary files /dev/null and b/bin/res/drawable-hdpi/status_pause.png differ
diff --git a/bin/res/drawable-hdpi/status_play.png b/bin/res/drawable-hdpi/status_play.png
new file mode 100644
index 00000000..8c95b6a5
Binary files /dev/null and b/bin/res/drawable-hdpi/status_play.png differ
diff --git a/bin/res/drawable-hdpi/status_prev.png b/bin/res/drawable-hdpi/status_prev.png
new file mode 100644
index 00000000..73fb16f2
Binary files /dev/null and b/bin/res/drawable-hdpi/status_prev.png differ
diff --git a/bin/res/drawable-hdpi/title_bar_shadow.9.png b/bin/res/drawable-hdpi/title_bar_shadow.9.png
new file mode 100644
index 00000000..4da0e141
Binary files /dev/null and b/bin/res/drawable-hdpi/title_bar_shadow.9.png differ
diff --git a/bin/res/drawable-nodpi/bkgd_tile_black.png b/bin/res/drawable-nodpi/bkgd_tile_black.png
new file mode 100644
index 00000000..3c8387cf
Binary files /dev/null and b/bin/res/drawable-nodpi/bkgd_tile_black.png differ
diff --git a/bin/res/drawable-nodpi/preview_two.png b/bin/res/drawable-nodpi/preview_two.png
new file mode 100644
index 00000000..9d722ef4
Binary files /dev/null and b/bin/res/drawable-nodpi/preview_two.png differ
diff --git a/bin/res/drawable-xhdpi/action_bar_bg.9.png b/bin/res/drawable-xhdpi/action_bar_bg.9.png
new file mode 100644
index 00000000..8c24f3c8
Binary files /dev/null and b/bin/res/drawable-xhdpi/action_bar_bg.9.png differ
diff --git a/bin/res/drawable-xhdpi/media_backward_normal.png b/bin/res/drawable-xhdpi/media_backward_normal.png
new file mode 100644
index 00000000..83ce8f7b
Binary files /dev/null and b/bin/res/drawable-xhdpi/media_backward_normal.png differ
diff --git a/bin/res/drawable-xhdpi/media_forward_normal.png b/bin/res/drawable-xhdpi/media_forward_normal.png
new file mode 100644
index 00000000..95176d3b
Binary files /dev/null and b/bin/res/drawable-xhdpi/media_forward_normal.png differ
diff --git a/bin/res/drawable-xhdpi/media_pause_normal.png b/bin/res/drawable-xhdpi/media_pause_normal.png
new file mode 100644
index 00000000..37be4a9f
Binary files /dev/null and b/bin/res/drawable-xhdpi/media_pause_normal.png differ
diff --git a/bin/res/drawable-xhdpi/media_repeat_all.png b/bin/res/drawable-xhdpi/media_repeat_all.png
new file mode 100644
index 00000000..8813d409
Binary files /dev/null and b/bin/res/drawable-xhdpi/media_repeat_all.png differ
diff --git a/bin/res/drawable-xhdpi/media_repeat_off.png b/bin/res/drawable-xhdpi/media_repeat_off.png
new file mode 100644
index 00000000..8813d409
Binary files /dev/null and b/bin/res/drawable-xhdpi/media_repeat_off.png differ
diff --git a/bin/res/drawable-xhdpi/media_repeat_single.png b/bin/res/drawable-xhdpi/media_repeat_single.png
new file mode 100644
index 00000000..8813d409
Binary files /dev/null and b/bin/res/drawable-xhdpi/media_repeat_single.png differ
diff --git a/bin/res/drawable-xhdpi/media_shuffle_normal.png b/bin/res/drawable-xhdpi/media_shuffle_normal.png
new file mode 100644
index 00000000..0a910483
Binary files /dev/null and b/bin/res/drawable-xhdpi/media_shuffle_normal.png differ
diff --git a/bin/res/drawable-xhdpi/media_start_normal.png b/bin/res/drawable-xhdpi/media_start_normal.png
new file mode 100644
index 00000000..5983975b
Binary files /dev/null and b/bin/res/drawable-xhdpi/media_start_normal.png differ
diff --git a/bin/res/drawable-xhdpi/media_start_pressed.png b/bin/res/drawable-xhdpi/media_start_pressed.png
new file mode 100644
index 00000000..65bee7af
Binary files /dev/null and b/bin/res/drawable-xhdpi/media_start_pressed.png differ
diff --git a/bin/res/drawable-xhdpi/media_stop_normal.png b/bin/res/drawable-xhdpi/media_stop_normal.png
new file mode 100644
index 00000000..1c9ef3c6
Binary files /dev/null and b/bin/res/drawable-xhdpi/media_stop_normal.png differ
diff --git a/bin/res/drawable-xhdpi/media_toggle_list_normal.png b/bin/res/drawable-xhdpi/media_toggle_list_normal.png
new file mode 100644
index 00000000..b019bef9
Binary files /dev/null and b/bin/res/drawable-xhdpi/media_toggle_list_normal.png differ
diff --git a/bin/res/drawable-xhdpi/menubar_button_disabled.9.png b/bin/res/drawable-xhdpi/menubar_button_disabled.9.png
new file mode 100644
index 00000000..5c8c7bce
Binary files /dev/null and b/bin/res/drawable-xhdpi/menubar_button_disabled.9.png differ
diff --git a/bin/res/drawable-xhdpi/menubar_button_normal.9.png b/bin/res/drawable-xhdpi/menubar_button_normal.9.png
new file mode 100644
index 00000000..8c24f3c8
Binary files /dev/null and b/bin/res/drawable-xhdpi/menubar_button_normal.9.png differ
diff --git a/bin/resources.ap_ b/bin/resources.ap_
index 6cbb307e..0e215251 100644
Binary files a/bin/resources.ap_ and b/bin/resources.ap_ differ
diff --git a/gen/net/sourceforge/subsonic/androidapp/R.java b/gen/net/sourceforge/subsonic/androidapp/R.java
index f064fcf2..76de183b 100644
--- a/gen/net/sourceforge/subsonic/androidapp/R.java
+++ b/gen/net/sourceforge/subsonic/androidapp/R.java
@@ -31,8 +31,10 @@ public final class R {
         public static final int black=0x7f070009;
         public static final int buttonoff=0x7f070006;
         public static final int buttonon=0x7f070007;
-        public static final int cyan=0x7f07000b;
+        public static final int cyan=0x7f07000c;
         public static final int dividerColor=0x7f070002;
+        public static final int grey=0x7f07000b;
+        public static final int ics_opaque=0x7f07000d;
         public static final int mediaControlBackground=0x7f070000;
         public static final int mediaControlForeground=0x7f070001;
         public static final int notificationArtist=0x7f070004;
@@ -45,230 +47,241 @@ public final class R {
         public static final int album_art_background=0x7f020001;
         public static final int appwidget_art_default=0x7f020002;
         public static final int appwidget_bg=0x7f020003;
-        public static final int btn_check_buttonless_off=0x7f020004;
-        public static final int btn_check_buttonless_on=0x7f020005;
-        public static final int btn_check_custom=0x7f020006;
-        public static final int buttonbar_selector=0x7f020007;
-        public static final int ic_appwidget_music_next=0x7f020008;
-        public static final int ic_appwidget_music_pause=0x7f020009;
-        public static final int ic_appwidget_music_play=0x7f02000a;
-        public static final int ic_appwidget_music_previous=0x7f02000b;
-        public static final int ic_launcher=0x7f02000c;
-        public static final int ic_menu_browse=0x7f02000d;
-        public static final int ic_menu_compass=0x7f02000e;
-        public static final int ic_menu_exit=0x7f02000f;
-        public static final int ic_menu_help=0x7f020010;
-        public static final int ic_menu_home=0x7f020011;
-        public static final int ic_menu_moreoverflow=0x7f020012;
-        public static final int ic_menu_offline=0x7f020013;
-        public static final int ic_menu_play_all=0x7f020014;
-        public static final int ic_menu_playlists=0x7f020015;
-        public static final int ic_menu_refresh=0x7f020016;
-        public static final int ic_menu_remove_all=0x7f020017;
-        public static final int ic_menu_save=0x7f020018;
-        public static final int ic_menu_screen_on_off=0x7f020019;
-        public static final int ic_menu_search=0x7f02001a;
-        public static final int ic_menu_select_artist_folder=0x7f02001b;
-        public static final int ic_menu_settings=0x7f02001c;
-        public static final int ic_menu_share=0x7f02001d;
-        public static final int ic_menu_shuffle=0x7f02001e;
-        public static final int ic_stat_downloaded=0x7f02001f;
-        public static final int ic_stat_downloading=0x7f020020;
-        public static final int ic_stat_play=0x7f020021;
-        public static final int ic_stat_saved=0x7f020022;
-        public static final int ic_stat_subsonic=0x7f020023;
-        public static final int list_background=0x7f020024;
-        public static final int list_focused_holo=0x7f020025;
-        public static final int list_item_more=0x7f020026;
-        public static final int list_longpressed_holo=0x7f020027;
-        public static final int list_pressed_holo_dark=0x7f020028;
-        public static final int list_pressed_holo_light=0x7f020029;
-        public static final int list_selector_background_transition_holo_dark=0x7f02002a;
-        public static final int list_selector_background_transition_holo_light=0x7f02002b;
-        public static final int list_selector_disabled_holo_dark=0x7f02002c;
-        public static final int list_selector_disabled_holo_light=0x7f02002d;
-        public static final int list_selector_holo_dark=0x7f02002e;
-        public static final int list_selector_holo_light=0x7f02002f;
-        public static final int main_header_icon=0x7f020030;
-        public static final int media_backward=0x7f020031;
-        public static final int media_backward_normal=0x7f020032;
-        public static final int media_backward_pressed=0x7f020033;
-        public static final int media_forward=0x7f020034;
-        public static final int media_forward_normal=0x7f020035;
-        public static final int media_forward_pressed=0x7f020036;
-        public static final int media_pause=0x7f020037;
-        public static final int media_pause_normal=0x7f020038;
-        public static final int media_pause_pressed=0x7f020039;
-        public static final int media_repeat_all=0x7f02003a;
-        public static final int media_repeat_off=0x7f02003b;
-        public static final int media_repeat_single=0x7f02003c;
-        public static final int media_shuffle=0x7f02003d;
-        public static final int media_shuffle_normal=0x7f02003e;
-        public static final int media_shuffle_pressed=0x7f02003f;
-        public static final int media_start=0x7f020040;
-        public static final int media_start_normal=0x7f020041;
-        public static final int media_start_pressed=0x7f020042;
-        public static final int media_stop=0x7f020043;
-        public static final int media_stop_normal=0x7f020044;
-        public static final int media_stop_pressed=0x7f020045;
-        public static final int media_toggle_list=0x7f020046;
-        public static final int media_toggle_list_normal=0x7f020047;
-        public static final int media_toggle_list_pressed=0x7f020048;
-        public static final int menubar_button_disabled=0x7f020049;
-        public static final int menubar_button_normal=0x7f02004a;
-        public static final int preview=0x7f02004b;
-        public static final int progress_bg_holo_dark=0x7f02004c;
-        public static final int progress_horizontal_holo_dark=0x7f02004d;
-        public static final int progress_primary_holo_dark=0x7f02004e;
-        public static final int progress_secondary_holo_dark=0x7f02004f;
-        public static final int select_album_play_all=0x7f020050;
-        public static final int select_album_play_all_normal=0x7f020051;
-        public static final int select_album_play_all_pressed=0x7f020052;
-        public static final int slider_knob=0x7f020053;
+        public static final int bg_separator=0x7f020004;
+        public static final int bkgd_tile_black=0x7f020005;
+        public static final int btn_bg=0x7f020006;
+        public static final int btn_check_buttonless_off=0x7f020007;
+        public static final int btn_check_buttonless_on=0x7f020008;
+        public static final int btn_check_custom=0x7f020009;
+        public static final int btn_collapse_group_normal_holo_dark=0x7f02000a;
+        public static final int buttonbar_selector=0x7f02000b;
+        public static final int ic_appwidget_music_next=0x7f02000c;
+        public static final int ic_appwidget_music_pause=0x7f02000d;
+        public static final int ic_appwidget_music_play=0x7f02000e;
+        public static final int ic_appwidget_music_previous=0x7f02000f;
+        public static final int ic_launcher=0x7f020010;
+        public static final int ic_menu_browse=0x7f020011;
+        public static final int ic_menu_compass=0x7f020012;
+        public static final int ic_menu_exit=0x7f020013;
+        public static final int ic_menu_help=0x7f020014;
+        public static final int ic_menu_home=0x7f020015;
+        public static final int ic_menu_moreoverflow=0x7f020016;
+        public static final int ic_menu_offline=0x7f020017;
+        public static final int ic_menu_play_all=0x7f020018;
+        public static final int ic_menu_playlists=0x7f020019;
+        public static final int ic_menu_refresh=0x7f02001a;
+        public static final int ic_menu_remove_all=0x7f02001b;
+        public static final int ic_menu_save=0x7f02001c;
+        public static final int ic_menu_screen_on_off=0x7f02001d;
+        public static final int ic_menu_search=0x7f02001e;
+        public static final int ic_menu_select_artist_folder=0x7f02001f;
+        public static final int ic_menu_settings=0x7f020020;
+        public static final int ic_menu_share=0x7f020021;
+        public static final int ic_menu_shuffle=0x7f020022;
+        public static final int ic_stat_downloaded=0x7f020023;
+        public static final int ic_stat_downloading=0x7f020024;
+        public static final int ic_stat_play=0x7f020025;
+        public static final int ic_stat_saved=0x7f020026;
+        public static final int ic_stat_subsonic=0x7f020027;
+        public static final int list_background=0x7f020028;
+        public static final int list_focused_holo=0x7f020029;
+        public static final int list_item_more=0x7f02002a;
+        public static final int list_longpressed_holo=0x7f02002b;
+        public static final int list_pressed_holo_dark=0x7f02002c;
+        public static final int list_pressed_holo_light=0x7f02002d;
+        public static final int list_selector_background_transition_holo_dark=0x7f02002e;
+        public static final int list_selector_background_transition_holo_light=0x7f02002f;
+        public static final int list_selector_disabled_holo_dark=0x7f020030;
+        public static final int list_selector_disabled_holo_light=0x7f020031;
+        public static final int list_selector_holo_dark=0x7f020032;
+        public static final int list_selector_holo_light=0x7f020033;
+        public static final int main_header_icon=0x7f020034;
+        public static final int media_backward_normal=0x7f020035;
+        public static final int media_forward_normal=0x7f020036;
+        public static final int media_pause_normal=0x7f020037;
+        public static final int media_repeat_all=0x7f020038;
+        public static final int media_repeat_off=0x7f020039;
+        public static final int media_repeat_single=0x7f02003a;
+        public static final int media_shuffle_normal=0x7f02003b;
+        public static final int media_start_normal=0x7f02003c;
+        public static final int media_start_pressed=0x7f02003d;
+        public static final int media_stop_normal=0x7f02003e;
+        public static final int media_toggle_list_normal=0x7f02003f;
+        public static final int menubar_button_disabled=0x7f020040;
+        public static final int menubar_button_normal=0x7f020041;
+        public static final int notify_panel_notification_icon_bg=0x7f020042;
+        public static final int pinstripe_tile=0x7f020043;
+        public static final int preview=0x7f020044;
+        public static final int preview_two=0x7f020045;
+        public static final int progress_bg_holo_dark=0x7f020046;
+        public static final int progress_horizontal_holo_dark=0x7f020047;
+        public static final int progress_primary_holo_dark=0x7f020048;
+        public static final int progress_secondary_holo_dark=0x7f020049;
+        public static final int select_album_play_all=0x7f02004a;
+        public static final int select_album_play_all_normal=0x7f02004b;
+        public static final int select_album_play_all_pressed=0x7f02004c;
+        public static final int slider_knob=0x7f02004d;
+        public static final int status_bg=0x7f02004e;
+        public static final int status_next=0x7f02004f;
+        public static final int status_pause=0x7f020050;
+        public static final int status_play=0x7f020051;
+        public static final int status_prev=0x7f020052;
+        public static final int title_bar_shadow=0x7f020053;
         public static final int unknown_album=0x7f020054;
         public static final int unknown_album_large=0x7f020055;
     }
     public static final class id {
-        public static final int action_button_1=0x7f0c0003;
-        public static final int action_button_2=0x7f0c0004;
-        public static final int action_button_3=0x7f0c0002;
-        public static final int actionbar_home_icon=0x7f0c0000;
-        public static final int actionbar_title_text=0x7f0c0001;
-        public static final int album_artist=0x7f0c0007;
-        public static final int album_coverart=0x7f0c0005;
-        public static final int album_menu_pin=0x7f0c0080;
-        public static final int album_menu_play_last=0x7f0c007f;
-        public static final int album_menu_play_now=0x7f0c007e;
-        public static final int album_title=0x7f0c0006;
-        public static final int appwidget_coverart=0x7f0c0008;
-        public static final int appwidget_top=0x7f0c000a;
-        public static final int artist=0x7f0c000c;
-        public static final int artist_menu_pin=0x7f0c0083;
-        public static final int artist_menu_play_last=0x7f0c0082;
-        public static final int artist_menu_play_now=0x7f0c0081;
-        public static final int button_bar=0x7f0c0010;
-        public static final int button_bar_home=0x7f0c0011;
-        public static final int button_bar_music=0x7f0c0012;
-        public static final int button_bar_now_playing=0x7f0c0015;
-        public static final int button_bar_playlists=0x7f0c0014;
-        public static final int button_bar_search=0x7f0c0013;
-        public static final int control_next=0x7f0c000f;
-        public static final int control_play=0x7f0c000e;
-        public static final int control_previous=0x7f0c000d;
-        public static final int download_album=0x7f0c002c;
-        public static final int download_album_art_image=0x7f0c0026;
-        public static final int download_album_art_layout=0x7f0c0025;
-        public static final int download_artist=0x7f0c002b;
-        public static final int download_button_bar_flipper=0x7f0c0028;
-        public static final int download_control_layout=0x7f0c0016;
-        public static final int download_duration=0x7f0c002a;
-        public static final int download_empty=0x7f0c002d;
-        public static final int download_equalizer=0x7f0c0021;
-        public static final int download_jukebox=0x7f0c0022;
-        public static final int download_list=0x7f0c002e;
-        public static final int download_next=0x7f0c001b;
-        public static final int download_pause=0x7f0c0018;
-        public static final int download_playlist_flipper=0x7f0c0024;
-        public static final int download_position=0x7f0c0029;
-        public static final int download_previous=0x7f0c0017;
-        public static final int download_progress_bar=0x7f0c002f;
-        public static final int download_repeat=0x7f0c001f;
-        public static final int download_shuffle=0x7f0c001e;
-        public static final int download_song_title=0x7f0c001d;
-        public static final int download_start=0x7f0c001a;
-        public static final int download_status=0x7f0c001c;
-        public static final int download_stop=0x7f0c0019;
-        public static final int download_toggle_list=0x7f0c0020;
-        public static final int download_visualizer=0x7f0c0023;
-        public static final int download_visualizer_view_layout=0x7f0c0027;
-        public static final int equalizer_bar=0x7f0c0035;
-        public static final int equalizer_frequency=0x7f0c0033;
-        public static final int equalizer_level=0x7f0c0034;
-        public static final int equalizer_enabled=0x7f0c0030;
-        public static final int equalizer_layout=0x7f0c0031;
-        public static final int equalizer_preset=0x7f0c0032;
-        public static final int help_back=0x7f0c0037;
-        public static final int help_buttons=0x7f0c0036;
-        public static final int help_close=0x7f0c0038;
-        public static final int help_contents=0x7f0c0039;
-        public static final int ic_menu_shuffle=0x7f0c0076;
-        public static final int jukebox_volume_progress_bar=0x7f0c003b;
-        public static final int linearLayout1=0x7f0c0009;
-        public static final int lyrics_artist=0x7f0c003c;
-        public static final int lyrics_text=0x7f0c003e;
-        public static final int lyrics_title=0x7f0c003d;
-        public static final int main_select_server_1=0x7f0c0042;
-        public static final int main_select_server_2=0x7f0c0043;
-        public static final int main_albums=0x7f0c0044;
-        public static final int main_albums_frequent=0x7f0c0047;
-        public static final int main_albums_highest=0x7f0c0048;
-        public static final int main_albums_newest=0x7f0c0045;
-        public static final int main_albums_random=0x7f0c0049;
-        public static final int main_albums_recent=0x7f0c0046;
-        public static final int main_dummy=0x7f0c0040;
-        public static final int main_list=0x7f0c003f;
-        public static final int main_select_server=0x7f0c0041;
-        public static final int menu_exit=0x7f0c0073;
-        public static final int menu_help=0x7f0c0075;
-        public static final int menu_lyrics=0x7f0c007b;
-        public static final int menu_remove=0x7f0c007c;
-        public static final int menu_remove_all=0x7f0c0078;
-        public static final int menu_save_playlist=0x7f0c0077;
-        public static final int menu_screen_on_off=0x7f0c0079;
-        public static final int menu_settings=0x7f0c0074;
-        public static final int menu_show_album=0x7f0c007a;
-        public static final int menu_shuffle=0x7f0c007d;
-        public static final int notification_artist=0x7f0c004c;
-        public static final int notification_image=0x7f0c004a;
-        public static final int notification_title=0x7f0c004b;
-        public static final int play_video_contents=0x7f0c004d;
-        public static final int progress_message=0x7f0c004e;
-        public static final int save_playlist_name=0x7f0c0050;
-        public static final int save_playlist_root=0x7f0c004f;
-        public static final int search_albums=0x7f0c0054;
-        public static final int search_artists=0x7f0c0053;
-        public static final int search_list=0x7f0c0051;
-        public static final int search_more_albums=0x7f0c0057;
-        public static final int search_more_artists=0x7f0c0056;
-        public static final int search_more_songs=0x7f0c0058;
-        public static final int search_search=0x7f0c0052;
-        public static final int search_songs=0x7f0c0055;
-        public static final int select_album_cover_art=0x7f0c0062;
-        public static final int select_album_delete=0x7f0c0060;
-        public static final int select_album_empty=0x7f0c0059;
-        public static final int select_album_entries=0x7f0c005a;
-        public static final int select_album_more=0x7f0c0061;
-        public static final int select_album_pin=0x7f0c005e;
-        public static final int select_album_play_all=0x7f0c0065;
-        public static final int select_album_play_last=0x7f0c005d;
-        public static final int select_album_play_now=0x7f0c005c;
-        public static final int select_album_select=0x7f0c005b;
-        public static final int select_album_text1=0x7f0c0063;
-        public static final int select_album_text2=0x7f0c0064;
-        public static final int select_album_unpin=0x7f0c005f;
-        public static final int select_artist_folder=0x7f0c0067;
-        public static final int select_artist_folder_1=0x7f0c0068;
-        public static final int select_artist_folder_2=0x7f0c0069;
-        public static final int select_artist_list=0x7f0c0066;
-        public static final int select_playlist_empty=0x7f0c006a;
-        public static final int select_playlist_list=0x7f0c006b;
-        public static final int song_artist=0x7f0c006f;
-        public static final int song_check=0x7f0c006c;
-        public static final int song_duration=0x7f0c0070;
-        public static final int song_menu_play_last=0x7f0c0086;
-        public static final int song_menu_play_next=0x7f0c0085;
-        public static final int song_menu_play_now=0x7f0c0084;
-        public static final int song_status=0x7f0c006e;
-        public static final int song_title=0x7f0c006d;
-        public static final int tab_progress=0x7f0c0071;
-        public static final int tab_progress_message=0x7f0c0072;
-        public static final int title=0x7f0c000b;
-        public static final int toast_layout_root=0x7f0c003a;
+        public static final int action_button_1=0x7f0d0003;
+        public static final int action_button_2=0x7f0d0004;
+        public static final int action_button_3=0x7f0d0002;
+        public static final int actionbar_home_icon=0x7f0d0000;
+        public static final int actionbar_title_text=0x7f0d0001;
+        public static final int album=0x7f0d004e;
+        public static final int album_artist=0x7f0d0007;
+        public static final int album_coverart=0x7f0d0005;
+        public static final int album_menu_pin=0x7f0d0087;
+        public static final int album_menu_play_last=0x7f0d0086;
+        public static final int album_menu_play_now=0x7f0d0085;
+        public static final int album_title=0x7f0d0006;
+        public static final int appwidget_coverart=0x7f0d0008;
+        public static final int appwidget_top=0x7f0d000a;
+        public static final int artist=0x7f0d000c;
+        public static final int artist_menu_pin=0x7f0d008a;
+        public static final int artist_menu_play_last=0x7f0d0089;
+        public static final int artist_menu_play_now=0x7f0d0088;
+        public static final int button_bar=0x7f0d0010;
+        public static final int button_bar_home=0x7f0d0011;
+        public static final int button_bar_music=0x7f0d0012;
+        public static final int button_bar_now_playing=0x7f0d0015;
+        public static final int button_bar_playlists=0x7f0d0014;
+        public static final int button_bar_search=0x7f0d0013;
+        public static final int control_next=0x7f0d000f;
+        public static final int control_play=0x7f0d000e;
+        public static final int control_previous=0x7f0d000d;
+        public static final int download_album=0x7f0d002c;
+        public static final int download_album_art_image=0x7f0d0026;
+        public static final int download_album_art_layout=0x7f0d0025;
+        public static final int download_artist=0x7f0d002b;
+        public static final int download_button_bar_flipper=0x7f0d0028;
+        public static final int download_control_layout=0x7f0d0016;
+        public static final int download_duration=0x7f0d002a;
+        public static final int download_empty=0x7f0d002d;
+        public static final int download_equalizer=0x7f0d0021;
+        public static final int download_jukebox=0x7f0d0022;
+        public static final int download_list=0x7f0d002e;
+        public static final int download_next=0x7f0d001b;
+        public static final int download_pause=0x7f0d0018;
+        public static final int download_playlist_flipper=0x7f0d0024;
+        public static final int download_position=0x7f0d0029;
+        public static final int download_previous=0x7f0d0017;
+        public static final int download_progress_bar=0x7f0d002f;
+        public static final int download_repeat=0x7f0d001f;
+        public static final int download_shuffle=0x7f0d001e;
+        public static final int download_song_title=0x7f0d001d;
+        public static final int download_start=0x7f0d001a;
+        public static final int download_status=0x7f0d001c;
+        public static final int download_stop=0x7f0d0019;
+        public static final int download_toggle_list=0x7f0d0020;
+        public static final int download_visualizer=0x7f0d0023;
+        public static final int download_visualizer_view_layout=0x7f0d0027;
+        public static final int equalizer_bar=0x7f0d0035;
+        public static final int equalizer_frequency=0x7f0d0033;
+        public static final int equalizer_level=0x7f0d0034;
+        public static final int equalizer_enabled=0x7f0d0030;
+        public static final int equalizer_layout=0x7f0d0031;
+        public static final int equalizer_preset=0x7f0d0032;
+        public static final int help_back=0x7f0d0037;
+        public static final int help_buttons=0x7f0d0036;
+        public static final int help_close=0x7f0d0038;
+        public static final int help_contents=0x7f0d0039;
+        public static final int ic_menu_shuffle=0x7f0d007d;
+        public static final int icon=0x7f0d0073;
+        public static final int jukebox_volume_progress_bar=0x7f0d003b;
+        public static final int linearLayout1=0x7f0d0009;
+        public static final int lyrics_artist=0x7f0d003c;
+        public static final int lyrics_text=0x7f0d003e;
+        public static final int lyrics_title=0x7f0d003d;
+        public static final int main_select_server_1=0x7f0d0042;
+        public static final int main_select_server_2=0x7f0d0043;
+        public static final int main_albums=0x7f0d0044;
+        public static final int main_albums_frequent=0x7f0d0047;
+        public static final int main_albums_highest=0x7f0d0048;
+        public static final int main_albums_newest=0x7f0d0045;
+        public static final int main_albums_random=0x7f0d0049;
+        public static final int main_albums_recent=0x7f0d0046;
+        public static final int main_dummy=0x7f0d0040;
+        public static final int main_list=0x7f0d003f;
+        public static final int main_select_server=0x7f0d0041;
+        public static final int menu_exit=0x7f0d007a;
+        public static final int menu_help=0x7f0d007c;
+        public static final int menu_lyrics=0x7f0d0082;
+        public static final int menu_remove=0x7f0d0083;
+        public static final int menu_remove_all=0x7f0d007f;
+        public static final int menu_save_playlist=0x7f0d007e;
+        public static final int menu_screen_on_off=0x7f0d0080;
+        public static final int menu_settings=0x7f0d007b;
+        public static final int menu_show_album=0x7f0d0081;
+        public static final int menu_shuffle=0x7f0d0084;
+        public static final int notification_image=0x7f0d004b;
+        public static final int play_video_contents=0x7f0d004f;
+        public static final int progress_message=0x7f0d0050;
+        public static final int save_playlist_name=0x7f0d0052;
+        public static final int save_playlist_root=0x7f0d0051;
+        public static final int search_albums=0x7f0d0056;
+        public static final int search_artists=0x7f0d0055;
+        public static final int search_list=0x7f0d0053;
+        public static final int search_more_albums=0x7f0d0059;
+        public static final int search_more_artists=0x7f0d0058;
+        public static final int search_more_songs=0x7f0d005a;
+        public static final int search_search=0x7f0d0054;
+        public static final int search_songs=0x7f0d0057;
+        public static final int select_album_cover_art=0x7f0d0064;
+        public static final int select_album_delete=0x7f0d0062;
+        public static final int select_album_empty=0x7f0d005b;
+        public static final int select_album_entries=0x7f0d005c;
+        public static final int select_album_more=0x7f0d0063;
+        public static final int select_album_pin=0x7f0d0060;
+        public static final int select_album_play_all=0x7f0d0067;
+        public static final int select_album_play_last=0x7f0d005f;
+        public static final int select_album_play_now=0x7f0d005e;
+        public static final int select_album_select=0x7f0d005d;
+        public static final int select_album_text1=0x7f0d0065;
+        public static final int select_album_text2=0x7f0d0066;
+        public static final int select_album_unpin=0x7f0d0061;
+        public static final int select_artist_folder=0x7f0d0069;
+        public static final int select_artist_folder_1=0x7f0d006a;
+        public static final int select_artist_folder_2=0x7f0d006b;
+        public static final int select_artist_list=0x7f0d0068;
+        public static final int select_playlist_empty=0x7f0d006c;
+        public static final int select_playlist_list=0x7f0d006d;
+        public static final int song_artist=0x7f0d0071;
+        public static final int song_check=0x7f0d006e;
+        public static final int song_duration=0x7f0d0072;
+        public static final int song_menu_play_last=0x7f0d008d;
+        public static final int song_menu_play_next=0x7f0d008c;
+        public static final int song_menu_play_now=0x7f0d008b;
+        public static final int song_status=0x7f0d0070;
+        public static final int song_title=0x7f0d006f;
+        public static final int status_icon=0x7f0d004c;
+        public static final int status_media_collapse=0x7f0d0077;
+        public static final int status_media_next=0x7f0d0076;
+        public static final int status_media_play=0x7f0d0075;
+        public static final int status_media_prev=0x7f0d0074;
+        public static final int statusbar=0x7f0d004a;
+        public static final int tab_progress=0x7f0d0078;
+        public static final int tab_progress_message=0x7f0d0079;
+        public static final int title=0x7f0d000b;
+        public static final int toast_layout_root=0x7f0d003a;
+        public static final int trackname=0x7f0d004d;
+    }
+    public static final class integer {
+        public static final int config_activityDefaultDur=0x7f080001;
+        public static final int config_activityShortDur=0x7f080000;
     }
     public static final class layout {
         public static final int action_bar=0x7f030000;
         public static final int album_list_item=0x7f030001;
-        public static final int appwidget=0x7f030002;
+        public static final int appwidget4x1=0x7f030002;
         public static final int artist_list_item=0x7f030003;
         public static final int button_bar=0x7f030004;
         public static final int download=0x7f030005;
@@ -296,244 +309,245 @@ public final class R {
         public static final int select_artist_header=0x7f03001b;
         public static final int select_playlist=0x7f03001c;
         public static final int song_list_item=0x7f03001d;
-        public static final int tab_progress=0x7f03001e;
+        public static final int statusbar=0x7f03001e;
+        public static final int tab_progress=0x7f03001f;
     }
     public static final class menu {
-        public static final int main=0x7f0b0000;
-        public static final int nowplaying=0x7f0b0001;
-        public static final int nowplaying_context=0x7f0b0002;
-        public static final int select_album_context=0x7f0b0003;
-        public static final int select_artist_context=0x7f0b0004;
-        public static final int select_song_context=0x7f0b0005;
+        public static final int main=0x7f0c0000;
+        public static final int nowplaying=0x7f0c0001;
+        public static final int nowplaying_context=0x7f0c0002;
+        public static final int select_album_context=0x7f0c0003;
+        public static final int select_artist_context=0x7f0c0004;
+        public static final int select_song_context=0x7f0c0005;
     }
     public static final class plurals {
-        public static final int select_album_donate_dialog_n_trial_days_left=0x7f090003;
-        public static final int select_album_n_songs=0x7f090000;
-        public static final int select_album_n_songs_added=0x7f090002;
-        public static final int select_album_n_songs_downloading=0x7f090001;
+        public static final int select_album_donate_dialog_n_trial_days_left=0x7f0a0003;
+        public static final int select_album_n_songs=0x7f0a0000;
+        public static final int select_album_n_songs_added=0x7f0a0002;
+        public static final int select_album_n_songs_downloading=0x7f0a0001;
     }
     public static final class string {
-        public static final int background_task_loading=0x7f0800a9;
-        public static final int background_task_network_error=0x7f0800ab;
-        public static final int background_task_no_network=0x7f0800aa;
-        public static final int background_task_not_found=0x7f0800ac;
-        public static final int background_task_parse_error=0x7f0800ad;
-        public static final int background_task_wait=0x7f0800a8;
-        public static final int button_bar_browse=0x7f08000b;
-        public static final int button_bar_home=0x7f08000a;
-        public static final int button_bar_now_playing=0x7f08000e;
-        public static final int button_bar_playlists=0x7f08000d;
-        public static final int button_bar_search=0x7f08000c;
-        public static final int common_appname=0x7f080000;
-        public static final int common_cancel=0x7f080003;
-        public static final int common_delete=0x7f080009;
-        public static final int common_ok=0x7f080001;
-        public static final int common_pin=0x7f080007;
-        public static final int common_play_last=0x7f080006;
-        public static final int common_play_next=0x7f080005;
-        public static final int common_play_now=0x7f080004;
-        public static final int common_save=0x7f080002;
-        public static final int common_unpin=0x7f080008;
-        public static final int download_empty=0x7f080041;
-        public static final int download_jukebox_not_authorized=0x7f08005d;
-        public static final int download_jukebox_off=0x7f080059;
-        public static final int download_jukebox_offline=0x7f08005c;
-        public static final int download_jukebox_on=0x7f080058;
-        public static final int download_jukebox_server_too_old=0x7f08005b;
-        public static final int download_jukebox_volume=0x7f08005a;
-        public static final int download_menu_lyrics=0x7f080046;
-        public static final int download_menu_remove=0x7f080047;
-        public static final int download_menu_remove_all=0x7f080048;
-        public static final int download_menu_save=0x7f08004c;
-        public static final int download_menu_screen_off=0x7f08004a;
-        public static final int download_menu_screen_on=0x7f080049;
-        public static final int download_menu_show_album=0x7f080045;
-        public static final int download_menu_shuffle=0x7f08004b;
-        public static final int download_menu_shuffle_notification=0x7f08004d;
-        public static final int download_playerstate_buffering=0x7f080043;
-        public static final int download_playerstate_downloading=0x7f080042;
-        public static final int download_playerstate_playing_shuffle=0x7f080044;
-        public static final int download_playlist_done=0x7f080051;
-        public static final int download_playlist_error=0x7f080052;
-        public static final int download_playlist_name=0x7f08004f;
-        public static final int download_playlist_saving=0x7f080050;
-        public static final int download_playlist_title=0x7f08004e;
-        public static final int download_repeat_all=0x7f080054;
-        public static final int download_repeat_off=0x7f080053;
-        public static final int download_repeat_single=0x7f080055;
-        public static final int download_visualizer_off=0x7f080057;
-        public static final int download_visualizer_on=0x7f080056;
-        public static final int equalizer_enabled=0x7f0800ba;
-        public static final int equalizer_label=0x7f0800b9;
-        public static final int equalizer_preset=0x7f0800bb;
-        public static final int error_label=0x7f080061;
-        public static final int help_back=0x7f080021;
-        public static final int help_close=0x7f080022;
-        public static final int help_label=0x7f08001f;
-        public static final int help_loading=0x7f080024;
-        public static final int help_title=0x7f080020;
-        public static final int help_url=0x7f080023;
-        public static final int lyrics_nomatch=0x7f080060;
-        public static final int main_albums_frequent=0x7f080018;
-        public static final int main_albums_highest=0x7f080019;
-        public static final int main_albums_newest=0x7f080016;
-        public static final int main_albums_random=0x7f08001a;
-        public static final int main_albums_recent=0x7f080017;
-        public static final int main_albums_title=0x7f080015;
-        public static final int main_offline=0x7f080013;
-        public static final int main_select_server=0x7f080011;
-        public static final int main_settings=0x7f080014;
-        public static final int main_shuffle=0x7f080012;
-        public static final int main_welcome_text=0x7f080010;
-        public static final int main_welcome_title=0x7f08000f;
-        public static final int menu_exit=0x7f08001b;
-        public static final int menu_help=0x7f08001d;
-        public static final int menu_settings=0x7f08001c;
-        public static final int music_library_label=0x7f080030;
-        public static final int music_library_label_offline=0x7f080031;
+        public static final int background_task_loading=0x7f0900a9;
+        public static final int background_task_network_error=0x7f0900ab;
+        public static final int background_task_no_network=0x7f0900aa;
+        public static final int background_task_not_found=0x7f0900ac;
+        public static final int background_task_parse_error=0x7f0900ad;
+        public static final int background_task_wait=0x7f0900a8;
+        public static final int button_bar_browse=0x7f09000b;
+        public static final int button_bar_home=0x7f09000a;
+        public static final int button_bar_now_playing=0x7f09000e;
+        public static final int button_bar_playlists=0x7f09000d;
+        public static final int button_bar_search=0x7f09000c;
+        public static final int common_appname=0x7f090000;
+        public static final int common_cancel=0x7f090003;
+        public static final int common_delete=0x7f090009;
+        public static final int common_ok=0x7f090001;
+        public static final int common_pin=0x7f090007;
+        public static final int common_play_last=0x7f090006;
+        public static final int common_play_next=0x7f090005;
+        public static final int common_play_now=0x7f090004;
+        public static final int common_save=0x7f090002;
+        public static final int common_unpin=0x7f090008;
+        public static final int download_empty=0x7f090041;
+        public static final int download_jukebox_not_authorized=0x7f09005d;
+        public static final int download_jukebox_off=0x7f090059;
+        public static final int download_jukebox_offline=0x7f09005c;
+        public static final int download_jukebox_on=0x7f090058;
+        public static final int download_jukebox_server_too_old=0x7f09005b;
+        public static final int download_jukebox_volume=0x7f09005a;
+        public static final int download_menu_lyrics=0x7f090046;
+        public static final int download_menu_remove=0x7f090047;
+        public static final int download_menu_remove_all=0x7f090048;
+        public static final int download_menu_save=0x7f09004c;
+        public static final int download_menu_screen_off=0x7f09004a;
+        public static final int download_menu_screen_on=0x7f090049;
+        public static final int download_menu_show_album=0x7f090045;
+        public static final int download_menu_shuffle=0x7f09004b;
+        public static final int download_menu_shuffle_notification=0x7f09004d;
+        public static final int download_playerstate_buffering=0x7f090043;
+        public static final int download_playerstate_downloading=0x7f090042;
+        public static final int download_playerstate_playing_shuffle=0x7f090044;
+        public static final int download_playlist_done=0x7f090051;
+        public static final int download_playlist_error=0x7f090052;
+        public static final int download_playlist_name=0x7f09004f;
+        public static final int download_playlist_saving=0x7f090050;
+        public static final int download_playlist_title=0x7f09004e;
+        public static final int download_repeat_all=0x7f090054;
+        public static final int download_repeat_off=0x7f090053;
+        public static final int download_repeat_single=0x7f090055;
+        public static final int download_visualizer_off=0x7f090057;
+        public static final int download_visualizer_on=0x7f090056;
+        public static final int equalizer_enabled=0x7f0900ba;
+        public static final int equalizer_label=0x7f0900b9;
+        public static final int equalizer_preset=0x7f0900bb;
+        public static final int error_label=0x7f090061;
+        public static final int help_back=0x7f090021;
+        public static final int help_close=0x7f090022;
+        public static final int help_label=0x7f09001f;
+        public static final int help_loading=0x7f090024;
+        public static final int help_title=0x7f090020;
+        public static final int help_url=0x7f090023;
+        public static final int lyrics_nomatch=0x7f090060;
+        public static final int main_albums_frequent=0x7f090018;
+        public static final int main_albums_highest=0x7f090019;
+        public static final int main_albums_newest=0x7f090016;
+        public static final int main_albums_random=0x7f09001a;
+        public static final int main_albums_recent=0x7f090017;
+        public static final int main_albums_title=0x7f090015;
+        public static final int main_offline=0x7f090013;
+        public static final int main_select_server=0x7f090011;
+        public static final int main_settings=0x7f090014;
+        public static final int main_shuffle=0x7f090012;
+        public static final int main_welcome_text=0x7f090010;
+        public static final int main_welcome_title=0x7f09000f;
+        public static final int menu_exit=0x7f09001b;
+        public static final int menu_help=0x7f09001d;
+        public static final int menu_settings=0x7f09001c;
+        public static final int music_library_label=0x7f090030;
+        public static final int music_library_label_offline=0x7f090031;
         /** <string name="settings.screen_lit_title">TODO: Keep screen on</string>
 <string name="settings.screen_lit_summary">TODO: Keeping the screen on when downloading may improve download speed</string>
          */
-        public static final int music_service_retry=0x7f0800a7;
-        public static final int parser_artist_count=0x7f0800b5;
-        public static final int parser_not_authenticated=0x7f0800b3;
-        public static final int parser_not_authorized=0x7f0800b4;
-        public static final int parser_reading=0x7f0800af;
-        public static final int parser_reading_done=0x7f0800b0;
-        public static final int parser_upgrade_client=0x7f0800b1;
-        public static final int parser_upgrade_server=0x7f0800b2;
-        public static final int play_video_loading=0x7f080025;
-        public static final int play_video_noplugin=0x7f080026;
+        public static final int music_service_retry=0x7f0900a7;
+        public static final int parser_artist_count=0x7f0900b5;
+        public static final int parser_not_authenticated=0x7f0900b3;
+        public static final int parser_not_authorized=0x7f0900b4;
+        public static final int parser_reading=0x7f0900af;
+        public static final int parser_reading_done=0x7f0900b0;
+        public static final int parser_upgrade_client=0x7f0900b1;
+        public static final int parser_upgrade_server=0x7f0900b2;
+        public static final int play_video_loading=0x7f090025;
+        public static final int play_video_noplugin=0x7f090026;
         /** <string name="menu.exit">TODO: Exit</string>
 <string name="menu.settings">TODO: Settings</string>
 <string name="menu.help">TODO: Help</string>
          */
-        public static final int playlist_label=0x7f08001e;
-        public static final int progress_wait=0x7f08002f;
-        public static final int search_albums=0x7f08002c;
-        public static final int search_artists=0x7f08002b;
-        public static final int search_label=0x7f080027;
-        public static final int search_more=0x7f08002e;
-        public static final int search_no_match=0x7f08002a;
-        public static final int search_search=0x7f080029;
-        public static final int search_songs=0x7f08002d;
-        public static final int search_title=0x7f080028;
-        public static final int select_album_donate_dialog_0_trial_days_left=0x7f08003f;
-        public static final int select_album_donate_dialog_later=0x7f08003e;
-        public static final int select_album_donate_dialog_message=0x7f08003c;
-        public static final int select_album_donate_dialog_now=0x7f08003d;
-        public static final int select_album_empty=0x7f080032;
+        public static final int playlist_label=0x7f09001e;
+        public static final int progress_wait=0x7f09002f;
+        public static final int search_albums=0x7f09002c;
+        public static final int search_artists=0x7f09002b;
+        public static final int search_label=0x7f090027;
+        public static final int search_more=0x7f09002e;
+        public static final int search_no_match=0x7f09002a;
+        public static final int search_search=0x7f090029;
+        public static final int search_songs=0x7f09002d;
+        public static final int search_title=0x7f090028;
+        public static final int select_album_donate_dialog_0_trial_days_left=0x7f09003f;
+        public static final int select_album_donate_dialog_later=0x7f09003e;
+        public static final int select_album_donate_dialog_message=0x7f09003c;
+        public static final int select_album_donate_dialog_now=0x7f09003d;
+        public static final int select_album_empty=0x7f090032;
         /** <string name="select_album.n_selected">TODO: %d tracks selected.</string>
 <string name="select_album.n_unselected">TODO: %d tracks unselected.</string>
          */
-        public static final int select_album_more=0x7f080036;
-        public static final int select_album_n_selected=0x7f080034;
-        public static final int select_album_n_unselected=0x7f080035;
-        public static final int select_album_no_network=0x7f08003a;
-        public static final int select_album_no_sdcard=0x7f080039;
-        public static final int select_album_not_licensed=0x7f08003b;
-        public static final int select_album_offline=0x7f080037;
-        public static final int select_album_searching=0x7f080038;
-        public static final int select_album_select=0x7f080033;
-        public static final int select_artist_all_folders=0x7f0800b8;
-        public static final int select_artist_folder=0x7f0800b7;
-        public static final int select_artist_refresh=0x7f0800b6;
-        public static final int select_playlist_empty=0x7f080040;
-        public static final int service_connecting=0x7f0800ae;
-        public static final int settings_appearance_title=0x7f080076;
-        public static final int settings_cache_location=0x7f08006e;
-        public static final int settings_cache_location_error=0x7f08006f;
-        public static final int settings_cache_size=0x7f08006d;
-        public static final int settings_cache_size_100=0x7f080092;
-        public static final int settings_cache_size_1000=0x7f080095;
-        public static final int settings_cache_size_10000=0x7f080098;
-        public static final int settings_cache_size_200=0x7f080093;
-        public static final int settings_cache_size_2000=0x7f080096;
-        public static final int settings_cache_size_20000=0x7f080099;
-        public static final int settings_cache_size_500=0x7f080094;
-        public static final int settings_cache_size_5000=0x7f080097;
-        public static final int settings_cache_size_unlimited=0x7f08009a;
-        public static final int settings_cache_title=0x7f08006b;
-        public static final int settings_clear_search_history=0x7f08009b;
-        public static final int settings_connection_failure=0x7f080073;
-        public static final int settings_hide_media_summary=0x7f0800a1;
+        public static final int select_album_more=0x7f090036;
+        public static final int select_album_n_selected=0x7f090034;
+        public static final int select_album_n_unselected=0x7f090035;
+        public static final int select_album_no_network=0x7f09003a;
+        public static final int select_album_no_sdcard=0x7f090039;
+        public static final int select_album_not_licensed=0x7f09003b;
+        public static final int select_album_offline=0x7f090037;
+        public static final int select_album_searching=0x7f090038;
+        public static final int select_album_select=0x7f090033;
+        public static final int select_artist_all_folders=0x7f0900b8;
+        public static final int select_artist_folder=0x7f0900b7;
+        public static final int select_artist_refresh=0x7f0900b6;
+        public static final int select_playlist_empty=0x7f090040;
+        public static final int service_connecting=0x7f0900ae;
+        public static final int settings_appearance_title=0x7f090076;
+        public static final int settings_cache_location=0x7f09006e;
+        public static final int settings_cache_location_error=0x7f09006f;
+        public static final int settings_cache_size=0x7f09006d;
+        public static final int settings_cache_size_100=0x7f090092;
+        public static final int settings_cache_size_1000=0x7f090095;
+        public static final int settings_cache_size_10000=0x7f090098;
+        public static final int settings_cache_size_200=0x7f090093;
+        public static final int settings_cache_size_2000=0x7f090096;
+        public static final int settings_cache_size_20000=0x7f090099;
+        public static final int settings_cache_size_500=0x7f090094;
+        public static final int settings_cache_size_5000=0x7f090097;
+        public static final int settings_cache_size_unlimited=0x7f09009a;
+        public static final int settings_cache_title=0x7f09006b;
+        public static final int settings_clear_search_history=0x7f09009b;
+        public static final int settings_connection_failure=0x7f090073;
+        public static final int settings_hide_media_summary=0x7f0900a1;
         /** <string name="settings.scrobble_title">TODO: Scrobble to Last.fm</string>
 <string name="settings.scrobble_summary">TODO: Remember to set up your Last.fm user and password on the Subsonic server</string>
          */
-        public static final int settings_hide_media_title=0x7f0800a0;
-        public static final int settings_hide_media_toast=0x7f0800a2;
-        public static final int settings_invalid_url=0x7f080074;
-        public static final int settings_invalid_username=0x7f080075;
-        public static final int settings_max_bitrate_112=0x7f080083;
-        public static final int settings_max_bitrate_128=0x7f080084;
-        public static final int settings_max_bitrate_160=0x7f080085;
-        public static final int settings_max_bitrate_192=0x7f080086;
-        public static final int settings_max_bitrate_256=0x7f080087;
-        public static final int settings_max_bitrate_32=0x7f08007f;
-        public static final int settings_max_bitrate_320=0x7f080088;
-        public static final int settings_max_bitrate_64=0x7f080080;
-        public static final int settings_max_bitrate_80=0x7f080081;
-        public static final int settings_max_bitrate_96=0x7f080082;
-        public static final int settings_max_bitrate_mobile=0x7f08007e;
-        public static final int settings_max_bitrate_unlimited=0x7f080089;
-        public static final int settings_max_bitrate_wifi=0x7f08007d;
-        public static final int settings_media_button_summary=0x7f0800a4;
-        public static final int settings_media_button_title=0x7f0800a3;
-        public static final int settings_network_title=0x7f08007c;
-        public static final int settings_other_title=0x7f08009d;
-        public static final int settings_preload=0x7f08006c;
-        public static final int settings_preload_1=0x7f08008c;
-        public static final int settings_preload_10=0x7f080090;
-        public static final int settings_preload_2=0x7f08008d;
-        public static final int settings_preload_3=0x7f08008e;
-        public static final int settings_preload_5=0x7f08008f;
-        public static final int settings_preload_unlimited=0x7f080091;
-        public static final int settings_screen_lit_summary=0x7f0800a6;
-        public static final int settings_screen_lit_title=0x7f0800a5;
-        public static final int settings_scrobble_summary=0x7f08009f;
-        public static final int settings_scrobble_title=0x7f08009e;
-        public static final int settings_search_history_cleared=0x7f08009c;
-        public static final int settings_server_address=0x7f080068;
-        public static final int settings_server_name=0x7f080067;
-        public static final int settings_server_password=0x7f08006a;
-        public static final int settings_server_unused1=0x7f080065;
-        public static final int settings_server_unused2=0x7f080066;
-        public static final int settings_server_username=0x7f080069;
-        public static final int settings_servers_title=0x7f080064;
-        public static final int settings_test_connection_title=0x7f080063;
-        public static final int settings_testing_connection=0x7f080070;
-        public static final int settings_testing_ok=0x7f080071;
-        public static final int settings_testing_unlicensed=0x7f080072;
-        public static final int settings_theme_dark=0x7f08007b;
-        public static final int settings_theme_fullscreen=0x7f080078;
-        public static final int settings_theme_fullscreenlight=0x7f080079;
-        public static final int settings_theme_light=0x7f08007a;
-        public static final int settings_theme_title=0x7f080077;
-        public static final int settings_theme_wheat=0x7f0800c3;
-        public static final int settings_title=0x7f080062;
-        public static final int settings_wifi_required_summary=0x7f08008b;
-        public static final int settings_wifi_required_title=0x7f08008a;
-        public static final int song_details_all=0x7f08005e;
-        public static final int song_details_kbps=0x7f08005f;
-        public static final int util_bytes_format_byte=0x7f0800c2;
-        public static final int util_bytes_format_gigabyte=0x7f0800bf;
-        public static final int util_bytes_format_kilobyte=0x7f0800c1;
-        public static final int util_bytes_format_megabyte=0x7f0800c0;
-        public static final int widget_initial_text=0x7f0800bc;
-        public static final int widget_sdcard_busy=0x7f0800bd;
-        public static final int widget_sdcard_missing=0x7f0800be;
+        public static final int settings_hide_media_title=0x7f0900a0;
+        public static final int settings_hide_media_toast=0x7f0900a2;
+        public static final int settings_invalid_url=0x7f090074;
+        public static final int settings_invalid_username=0x7f090075;
+        public static final int settings_max_bitrate_112=0x7f090083;
+        public static final int settings_max_bitrate_128=0x7f090084;
+        public static final int settings_max_bitrate_160=0x7f090085;
+        public static final int settings_max_bitrate_192=0x7f090086;
+        public static final int settings_max_bitrate_256=0x7f090087;
+        public static final int settings_max_bitrate_32=0x7f09007f;
+        public static final int settings_max_bitrate_320=0x7f090088;
+        public static final int settings_max_bitrate_64=0x7f090080;
+        public static final int settings_max_bitrate_80=0x7f090081;
+        public static final int settings_max_bitrate_96=0x7f090082;
+        public static final int settings_max_bitrate_mobile=0x7f09007e;
+        public static final int settings_max_bitrate_unlimited=0x7f090089;
+        public static final int settings_max_bitrate_wifi=0x7f09007d;
+        public static final int settings_media_button_summary=0x7f0900a4;
+        public static final int settings_media_button_title=0x7f0900a3;
+        public static final int settings_network_title=0x7f09007c;
+        public static final int settings_other_title=0x7f09009d;
+        public static final int settings_preload=0x7f09006c;
+        public static final int settings_preload_1=0x7f09008c;
+        public static final int settings_preload_10=0x7f090090;
+        public static final int settings_preload_2=0x7f09008d;
+        public static final int settings_preload_3=0x7f09008e;
+        public static final int settings_preload_5=0x7f09008f;
+        public static final int settings_preload_unlimited=0x7f090091;
+        public static final int settings_screen_lit_summary=0x7f0900a6;
+        public static final int settings_screen_lit_title=0x7f0900a5;
+        public static final int settings_scrobble_summary=0x7f09009f;
+        public static final int settings_scrobble_title=0x7f09009e;
+        public static final int settings_search_history_cleared=0x7f09009c;
+        public static final int settings_server_address=0x7f090068;
+        public static final int settings_server_name=0x7f090067;
+        public static final int settings_server_password=0x7f09006a;
+        public static final int settings_server_unused1=0x7f090065;
+        public static final int settings_server_unused2=0x7f090066;
+        public static final int settings_server_username=0x7f090069;
+        public static final int settings_servers_title=0x7f090064;
+        public static final int settings_test_connection_title=0x7f090063;
+        public static final int settings_testing_connection=0x7f090070;
+        public static final int settings_testing_ok=0x7f090071;
+        public static final int settings_testing_unlicensed=0x7f090072;
+        public static final int settings_theme_dark=0x7f09007b;
+        public static final int settings_theme_fullscreen=0x7f090078;
+        public static final int settings_theme_fullscreenlight=0x7f090079;
+        public static final int settings_theme_light=0x7f09007a;
+        public static final int settings_theme_title=0x7f090077;
+        public static final int settings_theme_wheat=0x7f0900c3;
+        public static final int settings_title=0x7f090062;
+        public static final int settings_wifi_required_summary=0x7f09008b;
+        public static final int settings_wifi_required_title=0x7f09008a;
+        public static final int song_details_all=0x7f09005e;
+        public static final int song_details_kbps=0x7f09005f;
+        public static final int util_bytes_format_byte=0x7f0900c2;
+        public static final int util_bytes_format_gigabyte=0x7f0900bf;
+        public static final int util_bytes_format_kilobyte=0x7f0900c1;
+        public static final int util_bytes_format_megabyte=0x7f0900c0;
+        public static final int widget_initial_text=0x7f0900bc;
+        public static final int widget_sdcard_busy=0x7f0900bd;
+        public static final int widget_sdcard_missing=0x7f0900be;
     }
     public static final class style {
-        public static final int Dark=0x7f0a0000;
-        public static final int Fullscreen=0x7f0a0002;
-        public static final int Fullscreenlight=0x7f0a0003;
-        public static final int Light=0x7f0a0001;
-        public static final int customprogress=0x7f0a0006;
-        public static final int listselect=0x7f0a0004;
-        public static final int listselectlight=0x7f0a0005;
+        public static final int Dark=0x7f0b0000;
+        public static final int Fullscreen=0x7f0b0002;
+        public static final int Fullscreenlight=0x7f0b0003;
+        public static final int Light=0x7f0b0001;
+        public static final int customprogress=0x7f0b0006;
+        public static final int listselect=0x7f0b0004;
+        public static final int listselectlight=0x7f0b0005;
     }
     public static final class xml {
-        public static final int appwidget_info=0x7f050000;
+        public static final int appwidget_info_4x1=0x7f050000;
         public static final int searchable=0x7f050001;
         public static final int settings=0x7f050002;
     }
diff --git a/res/drawable-hdpi/action_bar_bg.9.png b/res/drawable-hdpi/action_bar_bg.9.png
index 895b5fa1..611ae9b6 100644
Binary files a/res/drawable-hdpi/action_bar_bg.9.png and b/res/drawable-hdpi/action_bar_bg.9.png differ
diff --git a/res/drawable-hdpi/bg_separator.9.png b/res/drawable-hdpi/bg_separator.9.png
new file mode 100644
index 00000000..4dc1b348
Binary files /dev/null and b/res/drawable-hdpi/bg_separator.9.png differ
diff --git a/res/drawable-hdpi/btn_collapse_group_normal_holo_dark.png b/res/drawable-hdpi/btn_collapse_group_normal_holo_dark.png
new file mode 100644
index 00000000..848ce0d1
Binary files /dev/null and b/res/drawable-hdpi/btn_collapse_group_normal_holo_dark.png differ
diff --git a/res/drawable-hdpi/media_backward_normal.png b/res/drawable-hdpi/media_backward_normal.png
index d06749bd..bded5137 100644
Binary files a/res/drawable-hdpi/media_backward_normal.png and b/res/drawable-hdpi/media_backward_normal.png differ
diff --git a/res/drawable-hdpi/media_backward_pressed.png b/res/drawable-hdpi/media_backward_pressed.png
deleted file mode 100644
index 7f0ecb90..00000000
Binary files a/res/drawable-hdpi/media_backward_pressed.png and /dev/null differ
diff --git a/res/drawable-hdpi/media_forward_normal.png b/res/drawable-hdpi/media_forward_normal.png
index 2ef6ba1a..2bb004da 100644
Binary files a/res/drawable-hdpi/media_forward_normal.png and b/res/drawable-hdpi/media_forward_normal.png differ
diff --git a/res/drawable-hdpi/media_forward_pressed.png b/res/drawable-hdpi/media_forward_pressed.png
deleted file mode 100644
index c6132826..00000000
Binary files a/res/drawable-hdpi/media_forward_pressed.png and /dev/null differ
diff --git a/res/drawable-hdpi/media_pause_normal.png b/res/drawable-hdpi/media_pause_normal.png
index ee109f92..9f623eab 100644
Binary files a/res/drawable-hdpi/media_pause_normal.png and b/res/drawable-hdpi/media_pause_normal.png differ
diff --git a/res/drawable-hdpi/media_pause_pressed.png b/res/drawable-hdpi/media_pause_pressed.png
deleted file mode 100644
index 442b32f4..00000000
Binary files a/res/drawable-hdpi/media_pause_pressed.png and /dev/null differ
diff --git a/res/drawable-hdpi/media_repeat_all.png b/res/drawable-hdpi/media_repeat_all.png
index 152ef5ed..daf966eb 100644
Binary files a/res/drawable-hdpi/media_repeat_all.png and b/res/drawable-hdpi/media_repeat_all.png differ
diff --git a/res/drawable-hdpi/media_repeat_off.png b/res/drawable-hdpi/media_repeat_off.png
index f644b083..daf966eb 100644
Binary files a/res/drawable-hdpi/media_repeat_off.png and b/res/drawable-hdpi/media_repeat_off.png differ
diff --git a/res/drawable-hdpi/media_repeat_single.png b/res/drawable-hdpi/media_repeat_single.png
index 6202aa43..daf966eb 100644
Binary files a/res/drawable-hdpi/media_repeat_single.png and b/res/drawable-hdpi/media_repeat_single.png differ
diff --git a/res/drawable-hdpi/media_shuffle_normal.png b/res/drawable-hdpi/media_shuffle_normal.png
index b48f77e3..44784e3d 100644
Binary files a/res/drawable-hdpi/media_shuffle_normal.png and b/res/drawable-hdpi/media_shuffle_normal.png differ
diff --git a/res/drawable-hdpi/media_shuffle_pressed.png b/res/drawable-hdpi/media_shuffle_pressed.png
deleted file mode 100644
index 6786a329..00000000
Binary files a/res/drawable-hdpi/media_shuffle_pressed.png and /dev/null differ
diff --git a/res/drawable-hdpi/media_start_normal.png b/res/drawable-hdpi/media_start_normal.png
index ed1364ff..19641d8c 100644
Binary files a/res/drawable-hdpi/media_start_normal.png and b/res/drawable-hdpi/media_start_normal.png differ
diff --git a/res/drawable-hdpi/media_start_pressed.png b/res/drawable-hdpi/media_start_pressed.png
index 899376ad..35ba70fa 100644
Binary files a/res/drawable-hdpi/media_start_pressed.png and b/res/drawable-hdpi/media_start_pressed.png differ
diff --git a/res/drawable-hdpi/media_stop_normal.png b/res/drawable-hdpi/media_stop_normal.png
index 8f58c4e3..ad89af65 100644
Binary files a/res/drawable-hdpi/media_stop_normal.png and b/res/drawable-hdpi/media_stop_normal.png differ
diff --git a/res/drawable-hdpi/media_stop_pressed.png b/res/drawable-hdpi/media_stop_pressed.png
deleted file mode 100644
index 6483370b..00000000
Binary files a/res/drawable-hdpi/media_stop_pressed.png and /dev/null differ
diff --git a/res/drawable-hdpi/media_toggle_list_normal.png b/res/drawable-hdpi/media_toggle_list_normal.png
index fb5c6686..61e408d5 100644
Binary files a/res/drawable-hdpi/media_toggle_list_normal.png and b/res/drawable-hdpi/media_toggle_list_normal.png differ
diff --git a/res/drawable-hdpi/media_toggle_list_pressed.png b/res/drawable-hdpi/media_toggle_list_pressed.png
deleted file mode 100644
index 639a62ff..00000000
Binary files a/res/drawable-hdpi/media_toggle_list_pressed.png and /dev/null differ
diff --git a/res/drawable-hdpi/menubar_button_disabled.9.png b/res/drawable-hdpi/menubar_button_disabled.9.png
index f23c3347..abc28937 100644
Binary files a/res/drawable-hdpi/menubar_button_disabled.9.png and b/res/drawable-hdpi/menubar_button_disabled.9.png differ
diff --git a/res/drawable-hdpi/menubar_button_normal.9.png b/res/drawable-hdpi/menubar_button_normal.9.png
index f9c52998..611ae9b6 100644
Binary files a/res/drawable-hdpi/menubar_button_normal.9.png and b/res/drawable-hdpi/menubar_button_normal.9.png differ
diff --git a/res/drawable-hdpi/notify_panel_notification_icon_bg.png b/res/drawable-hdpi/notify_panel_notification_icon_bg.png
new file mode 100644
index 00000000..6f37a22d
Binary files /dev/null and b/res/drawable-hdpi/notify_panel_notification_icon_bg.png differ
diff --git a/res/drawable-hdpi/status_next.png b/res/drawable-hdpi/status_next.png
new file mode 100644
index 00000000..5835f654
Binary files /dev/null and b/res/drawable-hdpi/status_next.png differ
diff --git a/res/drawable-hdpi/status_pause.png b/res/drawable-hdpi/status_pause.png
new file mode 100644
index 00000000..3324f88f
Binary files /dev/null and b/res/drawable-hdpi/status_pause.png differ
diff --git a/res/drawable-hdpi/status_play.png b/res/drawable-hdpi/status_play.png
new file mode 100644
index 00000000..8c95b6a5
Binary files /dev/null and b/res/drawable-hdpi/status_play.png differ
diff --git a/res/drawable-hdpi/status_prev.png b/res/drawable-hdpi/status_prev.png
new file mode 100644
index 00000000..73fb16f2
Binary files /dev/null and b/res/drawable-hdpi/status_prev.png differ
diff --git a/res/drawable-hdpi/title_bar_shadow.9.png b/res/drawable-hdpi/title_bar_shadow.9.png
new file mode 100644
index 00000000..4dc1b348
Binary files /dev/null and b/res/drawable-hdpi/title_bar_shadow.9.png differ
diff --git a/res/drawable-nodpi/bkgd_tile_black.png b/res/drawable-nodpi/bkgd_tile_black.png
new file mode 100644
index 00000000..3c8387cf
Binary files /dev/null and b/res/drawable-nodpi/bkgd_tile_black.png differ
diff --git a/res/drawable-nodpi/preview_two.png b/res/drawable-nodpi/preview_two.png
new file mode 100644
index 00000000..ba4bcee1
Binary files /dev/null and b/res/drawable-nodpi/preview_two.png differ
diff --git a/res/drawable-xhdpi/action_bar_bg.9.png b/res/drawable-xhdpi/action_bar_bg.9.png
new file mode 100644
index 00000000..611ae9b6
Binary files /dev/null and b/res/drawable-xhdpi/action_bar_bg.9.png differ
diff --git a/res/drawable-xhdpi/media_backward_normal.png b/res/drawable-xhdpi/media_backward_normal.png
new file mode 100644
index 00000000..bded5137
Binary files /dev/null and b/res/drawable-xhdpi/media_backward_normal.png differ
diff --git a/res/drawable-xhdpi/media_forward_normal.png b/res/drawable-xhdpi/media_forward_normal.png
new file mode 100644
index 00000000..2bb004da
Binary files /dev/null and b/res/drawable-xhdpi/media_forward_normal.png differ
diff --git a/res/drawable-xhdpi/media_pause_normal.png b/res/drawable-xhdpi/media_pause_normal.png
new file mode 100644
index 00000000..9f623eab
Binary files /dev/null and b/res/drawable-xhdpi/media_pause_normal.png differ
diff --git a/res/drawable-xhdpi/media_repeat_all.png b/res/drawable-xhdpi/media_repeat_all.png
new file mode 100644
index 00000000..daf966eb
Binary files /dev/null and b/res/drawable-xhdpi/media_repeat_all.png differ
diff --git a/res/drawable-xhdpi/media_repeat_off.png b/res/drawable-xhdpi/media_repeat_off.png
new file mode 100644
index 00000000..daf966eb
Binary files /dev/null and b/res/drawable-xhdpi/media_repeat_off.png differ
diff --git a/res/drawable-xhdpi/media_repeat_single.png b/res/drawable-xhdpi/media_repeat_single.png
new file mode 100644
index 00000000..daf966eb
Binary files /dev/null and b/res/drawable-xhdpi/media_repeat_single.png differ
diff --git a/res/drawable-xhdpi/media_shuffle_normal.png b/res/drawable-xhdpi/media_shuffle_normal.png
new file mode 100644
index 00000000..44784e3d
Binary files /dev/null and b/res/drawable-xhdpi/media_shuffle_normal.png differ
diff --git a/res/drawable-xhdpi/media_start_normal.png b/res/drawable-xhdpi/media_start_normal.png
new file mode 100644
index 00000000..19641d8c
Binary files /dev/null and b/res/drawable-xhdpi/media_start_normal.png differ
diff --git a/res/drawable-xhdpi/media_start_pressed.png b/res/drawable-xhdpi/media_start_pressed.png
new file mode 100644
index 00000000..35ba70fa
Binary files /dev/null and b/res/drawable-xhdpi/media_start_pressed.png differ
diff --git a/res/drawable-xhdpi/media_stop_normal.png b/res/drawable-xhdpi/media_stop_normal.png
new file mode 100644
index 00000000..ad89af65
Binary files /dev/null and b/res/drawable-xhdpi/media_stop_normal.png differ
diff --git a/res/drawable-xhdpi/media_toggle_list_normal.png b/res/drawable-xhdpi/media_toggle_list_normal.png
new file mode 100644
index 00000000..61e408d5
Binary files /dev/null and b/res/drawable-xhdpi/media_toggle_list_normal.png differ
diff --git a/res/drawable-xhdpi/menubar_button_disabled.9.png b/res/drawable-xhdpi/menubar_button_disabled.9.png
new file mode 100644
index 00000000..abc28937
Binary files /dev/null and b/res/drawable-xhdpi/menubar_button_disabled.9.png differ
diff --git a/res/drawable-xhdpi/menubar_button_normal.9.png b/res/drawable-xhdpi/menubar_button_normal.9.png
new file mode 100644
index 00000000..611ae9b6
Binary files /dev/null and b/res/drawable-xhdpi/menubar_button_normal.9.png differ
diff --git a/res/drawable/btn_bg.xml b/res/drawable/btn_bg.xml
new file mode 100644
index 00000000..79d40784
--- /dev/null
+++ b/res/drawable/btn_bg.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2010 The Android Open Source Project Licensed under the 
+	Apache License, Version 2.0 (the "License"); you may not use this file except 
+	in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
+	Unless required by applicable law or agreed to in writing, software distributed 
+	under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES 
+	OR CONDITIONS OF ANY KIND, either express or implied. See the License for 
+	the specific language governing permissions and limitations under the License.


+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+
+    <item android:drawable="@color/ics_opaque" android:state_pressed="true"/>
+    <item android:drawable="@color/ics_opaque" android:state_enabled="true" android:state_focused="true"/>
+
+</selector>
\ No newline at end of file
diff --git a/res/drawable/media_backward.xml b/res/drawable/media_backward.xml
deleted file mode 100644
index 8ed1c158..00000000
--- a/res/drawable/media_backward.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:a="http://schemas.android.com/apk/res/android">
-    <item a:state_pressed="true" a:drawable="@drawable/media_backward_pressed" />
-    <item a:drawable="@drawable/media_backward_normal" />
-</selector>
\ No newline at end of file
diff --git a/res/drawable/media_forward.xml b/res/drawable/media_forward.xml
deleted file mode 100644
index a8e5b799..00000000
--- a/res/drawable/media_forward.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:a="http://schemas.android.com/apk/res/android">
-    <item a:state_pressed="true" a:drawable="@drawable/media_forward_pressed" />
-    <item a:drawable="@drawable/media_forward_normal" />
-</selector>
\ No newline at end of file
diff --git a/res/drawable/media_pause.xml b/res/drawable/media_pause.xml
deleted file mode 100644
index 8bd1233d..00000000
--- a/res/drawable/media_pause.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:a="http://schemas.android.com/apk/res/android">
-    <item a:state_pressed="true" a:drawable="@drawable/media_pause_pressed" />
-    <item a:drawable="@drawable/media_pause_normal" />
-</selector>
\ No newline at end of file
diff --git a/res/drawable/media_shuffle.xml b/res/drawable/media_shuffle.xml
deleted file mode 100644
index abe2b13d..00000000
--- a/res/drawable/media_shuffle.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:a="http://schemas.android.com/apk/res/android">
-    <item a:state_pressed="true" a:drawable="@drawable/media_shuffle_pressed" />
-    <item a:drawable="@drawable/media_shuffle_normal" />
-</selector>
\ No newline at end of file
diff --git a/res/drawable/media_start.xml b/res/drawable/media_start.xml
deleted file mode 100644
index 617fa32b..00000000
--- a/res/drawable/media_start.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:a="http://schemas.android.com/apk/res/android">
-    <item a:state_pressed="true" a:drawable="@drawable/media_start_pressed" />
-    <item a:drawable="@drawable/media_start_normal" />
-</selector>
\ No newline at end of file
diff --git a/res/drawable/media_stop.xml b/res/drawable/media_stop.xml
deleted file mode 100644
index e883c9ff..00000000
--- a/res/drawable/media_stop.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:a="http://schemas.android.com/apk/res/android">
-    <item a:state_pressed="true" a:drawable="@drawable/media_stop_pressed" />
-    <item a:drawable="@drawable/media_stop_normal" />
-</selector>
\ No newline at end of file
diff --git a/res/drawable/media_toggle_list.xml b/res/drawable/media_toggle_list.xml
deleted file mode 100644
index f9b02367..00000000
--- a/res/drawable/media_toggle_list.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:a="http://schemas.android.com/apk/res/android">
-    <item a:state_pressed="true" a:drawable="@drawable/media_toggle_list_pressed" />
-    <item a:drawable="@drawable/media_toggle_list_normal" />
-</selector>
\ No newline at end of file
diff --git a/res/drawable/pinstripe_tile.xml b/res/drawable/pinstripe_tile.xml
new file mode 100644
index 00000000..d55e74db
--- /dev/null
+++ b/res/drawable/pinstripe_tile.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap android:src="@drawable/bkgd_tile_black" android:tileMode="repeat"
+  xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/res/drawable/status_bg.xml b/res/drawable/status_bg.xml
new file mode 100644
index 00000000..99e5ea61
--- /dev/null
+++ b/res/drawable/status_bg.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/notify_panel_notification_icon_bg"
+    android:tileMode="repeat" />
diff --git a/res/layout-land/download.xml b/res/layout-land/download.xml
index 623ee971..d514be64 100644
--- a/res/layout-land/download.xml
+++ b/res/layout-land/download.xml
@@ -26,7 +26,7 @@
 
                 <ImageButton
                         a:id="@+id/download_previous"
-                        a:src="@drawable/media_backward"
+                        a:src="@drawable/media_backward_normal"
                         a:background="@android:color/transparent"
                         a:padding="0dip"
                         a:layout_width="wrap_content"
@@ -35,7 +35,7 @@
                         />
                 <ImageButton
                         a:id="@+id/download_pause"
-                        a:src="@drawable/media_pause"
+                        a:src="@drawable/media_pause_normal"
                         a:background="@android:color/transparent"
                         a:padding="0dip"
                         a:layout_width="wrap_content"
@@ -44,7 +44,7 @@
                         />
                 <ImageButton
                         a:id="@+id/download_stop"
-                        a:src="@drawable/media_stop"
+                        a:src="@drawable/media_stop_normal"
                         a:background="@android:color/transparent"
                         a:padding="0dip"
                         a:layout_width="wrap_content"
@@ -53,7 +53,7 @@
                         />
                 <ImageButton
                         a:id="@+id/download_start"
-                        a:src="@drawable/media_start"
+                        a:src="@drawable/media_start_normal"
                         a:background="@android:color/transparent"
                         a:padding="0dip"
                         a:layout_width="wrap_content"
@@ -62,7 +62,7 @@
                         />
                 <ImageButton
                         a:id="@+id/download_next"
-                        a:src="@drawable/media_forward"
+                        a:src="@drawable/media_forward_normal"
                         a:background="@android:color/transparent"
                         a:padding="0dip"
                         a:layout_width="wrap_content"
@@ -112,7 +112,7 @@
                     a:layout_weight="1"
                     a:background="@android:color/transparent"
                     a:padding="9dip"
-                    a:src="@drawable/media_shuffle" />
+                    a:src="@drawable/media_shuffle_normal" />
 
                 <ImageButton
                     a:id="@+id/download_repeat"
@@ -130,7 +130,7 @@
                     a:layout_weight="1"
                     a:background="@android:color/transparent"
                     a:padding="9dip"
-                    a:src="@drawable/media_toggle_list" />
+                    a:src="@drawable/media_toggle_list_normal" />
 
                 <Button
                     a:id="@+id/download_equalizer"
diff --git a/res/layout-port/download.xml b/res/layout-port/download.xml
index 32b69600..8f06511f 100644
--- a/res/layout-port/download.xml
+++ b/res/layout-port/download.xml
@@ -21,7 +21,7 @@
             <ImageButton
                     a:id="@+id/download_repeat"
                     a:src="@drawable/media_repeat_off"
-                    a:background="@android:color/transparent"
+                    a:background="@color/transparent"
                     a:layout_width="wrap_content"
                     a:layout_height="wrap_content"
                     a:layout_gravity="top|right"
@@ -115,27 +115,14 @@
                     a:layout_marginLeft="80dip"
                     a:layout_marginRight="80dip"
                     a:layout_gravity="center_horizontal"
-                    a:layout_above="@+id/download_song_title"/>
-


-            <ImageButton
-                a:id="@+id/action_button_3"
-                a:layout_width="wrap_content"
-                a:layout_height="wrap_content"
-                a:layout_alignLeft="@+id/download_visualizer"
-                a:layout_alignParentBottom="true"
-                a:layout_alignParentRight="true"
-                a:background="@drawable/list_selector_holo_dark"
-                a:paddingBottom="12dip"
-                a:paddingLeft="8dip"
-                a:paddingTop="24dip"
-                a:src="@drawable/ic_menu_moreoverflow" />
+                    a:layout_above="@+id/download_song_title"/>
 
         </RelativeLayout>
 
         <include layout="@layout/download_playlist"/>
 
     </net.sourceforge.subsonic.androidapp.util.MyViewFlipper>
-


+



     <LinearLayout
         a:layout_width="fill_parent"
         a:layout_height="wrap_content"
@@ -143,7 +130,18 @@
         a:background="@color/mediaControlBackground"
         a:orientation="horizontal"
         a:paddingBottom="0dip"
-        a:paddingTop="0dip" >
+        a:paddingTop="0dip" >
+
+        <ImageButton
+            a:id="@+id/action_button_3"
+            a:layout_width="0dp"
+            a:layout_height="wrap_content"
+            a:layout_weight="1"
+            a:background="@drawable/list_selector_holo_dark"
+            a:paddingBottom="12dip"
+            a:paddingLeft="8dip"
+            a:paddingTop="24dip"
+            a:src="@drawable/ic_menu_moreoverflow" />
 
         <ImageButton
             a:id="@+id/download_shuffle"
@@ -151,69 +149,68 @@
             a:layout_height="fill_parent"
             a:layout_gravity="center_vertical|left"
             a:layout_weight="1"
-            a:background="@android:color/transparent"
+            a:background="@drawable/list_selector_holo_dark"
             a:paddingLeft="4dip"
-            a:src="@drawable/media_shuffle" />
-
+            a:src="@drawable/media_shuffle_normal" />
+

         <ImageButton
             a:id="@+id/download_previous"
             a:layout_width="0dp"
-            a:layout_height="wrap_content"
+            a:layout_height="match_parent"
             a:layout_gravity="center_vertical"
             a:layout_weight="1"
-            a:background="@android:color/transparent"
+            a:background="@drawable/list_selector_holo_dark"
             a:padding="0dip"
-            a:src="@drawable/media_backward" />
-
+            a:src="@drawable/media_backward_normal" />
+

         <ImageButton
             a:id="@+id/download_pause"
             a:layout_width="0dp"
-            a:layout_height="wrap_content"
+            a:layout_height="match_parent"
             a:layout_gravity="center_vertical"
             a:layout_weight="1"
-            a:background="@android:color/transparent"
+            a:background="@drawable/list_selector_holo_dark"
             a:padding="0dip"
-            a:src="@drawable/media_pause" />
-
+            a:src="@drawable/media_pause_normal" />
+

         <ImageButton
             a:id="@+id/download_stop"
             a:layout_width="0dp"
-            a:layout_height="wrap_content"
+            a:layout_height="match_parent"
             a:layout_gravity="center_vertical"
             a:layout_weight="1"
-            a:background="@android:color/transparent"
+            a:background="@drawable/list_selector_holo_dark"
             a:padding="0dip"
-            a:src="@drawable/media_stop" />
-
+            a:src="@drawable/media_stop_normal" />
+

         <ImageButton
             a:id="@+id/download_start"
             a:layout_width="0dp"
-            a:layout_height="wrap_content"
+            a:layout_height="match_parent"
             a:layout_gravity="center_vertical"
             a:layout_weight="1"
-            a:background="@android:color/transparent"
+            a:background="@drawable/list_selector_holo_dark"
             a:padding="0dip"
-            a:src="@drawable/media_start" />
-
+            a:src="@drawable/media_start_normal" />
+

         <ImageButton
             a:id="@+id/download_next"
             a:layout_width="0dp"
-            a:layout_height="wrap_content"
+            a:layout_height="match_parent"
             a:layout_gravity="center_vertical"
             a:layout_weight="1"
-            a:background="@android:color/transparent"
+            a:background="@drawable/list_selector_holo_dark"
             a:padding="0dip"
-            a:src="@drawable/media_forward" />
+            a:src="@drawable/media_forward_normal" />
 
         <ImageButton
             a:id="@+id/download_toggle_list"
             a:layout_width="0dip"
             a:layout_height="fill_parent"
-            a:layout_gravity="center_vertical|right"
             a:layout_weight="1"
-            a:background="@android:color/transparent"
+            a:background="@drawable/list_selector_holo_dark"
             a:paddingRight="4dip"
-            a:src="@drawable/media_toggle_list" />
+            a:src="@drawable/media_toggle_list_normal" />
     </LinearLayout>
 

     <include
diff --git a/res/layout/action_bar.xml b/res/layout/action_bar.xml
index 128cef2d..c2f0343c 100644
--- a/res/layout/action_bar.xml
+++ b/res/layout/action_bar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:a="http://schemas.android.com/apk/res/android"
     a:layout_width="fill_parent"
-    a:layout_height="45dp"
+    a:layout_height="48dp"
     a:background="@drawable/action_bar_bg"
     a:gravity="center" >
 
diff --git a/res/layout/appwidget.xml b/res/layout/appwidget4x1.xml
similarity index 98%
rename from res/layout/appwidget.xml
rename to res/layout/appwidget4x1.xml
index 98ab1398..1223c9f5 100644
--- a/res/layout/appwidget.xml
+++ b/res/layout/appwidget4x1.xml
@@ -85,7 +85,7 @@
             a:src="@drawable/ic_appwidget_music_play" />
 
         <ImageButton
-            a:id="@+id/control_next"
+            a:id="@+id/control_next" 
             a:layout_width="0dip"
             a:layout_height="fill_parent"
             a:layout_weight="1"
diff --git a/res/layout/button_bar.xml b/res/layout/button_bar.xml
index 4bed5b54..feda6895 100644
--- a/res/layout/button_bar.xml
+++ b/res/layout/button_bar.xml
@@ -4,16 +4,11 @@
               a:orientation="vertical"
               a:layout_gravity="bottom"
               a:layout_width="fill_parent"
-              a:layout_height="wrap_content" a:background="@color/black">
-
-    <View
-            a:layout_width="fill_parent"
-            a:layout_height="1px"
-            a:background="@color/dividerColor"/>
+              a:layout_height="wrap_content" a:background="@drawable/menubar_button_normal">
 
     <LinearLayout a:orientation="horizontal"
                   a:layout_width="fill_parent"
-                  a:layout_height="42dip"
+                  a:layout_height="48dp"
                   a:gravity="center_horizontal">
 

         <ImageButton
@@ -31,7 +26,7 @@
             a:layout_marginBottom="5dp"
             a:layout_marginTop="8dp"
             a:layout_weight="0.01"
-            a:background="@color/dividerColor" />
+            a:background="@drawable/bg_separator" />
 

         <ImageButton
             a:id="@+id/button_bar_music"
@@ -48,7 +43,7 @@
             a:layout_marginBottom="5dp"
             a:layout_marginTop="8dp"
             a:layout_weight="0.01"
-            a:background="@color/dividerColor" />
+            a:background="@drawable/bg_separator" />
 

         <ImageButton
             a:id="@+id/button_bar_search"
@@ -65,7 +60,7 @@
             a:layout_marginBottom="5dp"
             a:layout_marginTop="8dp"
             a:layout_weight="0.01"
-            a:background="@color/dividerColor" />
+            a:background="@drawable/bg_separator" />
 

         <ImageButton
             a:id="@+id/button_bar_playlists"
@@ -82,7 +77,7 @@
             a:layout_marginBottom="5dp"
             a:layout_marginTop="8dp"
             a:layout_weight="0.01"
-            a:background="@color/dividerColor" />
+            a:background="@drawable/bg_separator" />
 

         <ImageButton
             a:id="@+id/button_bar_now_playing"
diff --git a/res/layout/main.xml b/res/layout/main.xml
index c4f4b85d..55de2489 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -6,14 +6,7 @@
 
     <include 
             layout="@layout/action_bar"
-            a:layout_width="fill_parent"
-            a:layout_height="45dp"
-            />
-
-    <View
-            a:layout_width="fill_parent"
-            a:layout_height="1px"
-            a:background="@color/dividerColor"/>
+            a:layout_width="fill_parent"/>
 
     <ListView
             a:id="@+id/main_list"
diff --git a/res/layout/main_buttons.xml b/res/layout/main_buttons.xml
index 68b91ccc..fa28cd72 100644
--- a/res/layout/main_buttons.xml
+++ b/res/layout/main_buttons.xml
@@ -49,7 +49,6 @@
             a:layout_height="wrap_content"
             a:textAppearance="?android:attr/textAppearanceSmall"
             a:textColor="@color/cyan"
-            a:background="@color/transparent"
             a:gravity="center_vertical"
             a:paddingLeft="6dp" a:textAllCaps="true" a:textStyle="bold"/>
 
diff --git a/res/layout/notification.xml b/res/layout/notification.xml
index 3c5bc6b6..073128d1 100644
--- a/res/layout/notification.xml
+++ b/res/layout/notification.xml
@@ -1,31 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:a="http://schemas.android.com/apk/res/android"
-	a:layout_width="fill_parent"
-	a:layout_height="fill_parent"
-	a:padding="3dp">
-	<ImageView 
-		a:id="@+id/notification_image"
-		a:layout_width="wrap_content"
-		a:layout_height="fill_parent"
-		a:layout_marginRight="10dp"
-		a:layout_marginLeft="5dp"/>
-	<TextView 
-		a:id="@+id/notification_title"
-		a:layout_height="wrap_content"
-		a:layout_width="fill_parent"
-		a:textSize="16sp"
-		a:textStyle="bold"
-		a:textColor="@color/notificationTitle"
-		a:singleLine="true"
-		a:layout_toRightOf="@id/notification_image"
-		a:layout_alignParentTop="true"/>
-	<TextView 
-		a:id="@+id/notification_artist"
-		a:layout_height="wrap_content"
-		a:layout_width="fill_parent"
-		a:textSize="15sp"
-		a:textColor="@color/notificationArtist"
-		a:singleLine="true"
-		a:layout_toRightOf="@id/notification_image"
-		a:layout_below="@id/notification_title"/>
-</RelativeLayout>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/statusbar"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="horizontal" >
+
+        <ImageView
+            android:id="@+id/notification_image"
+            android:layout_width="64.0dip"
+            android:layout_height="64.0dip"
+            android:layout_weight="0.0"
+            android:gravity="center" />
+
+        <ImageView
+            android:id="@+id/status_icon"
+            android:layout_width="64.0dip"
+            android:layout_height="64.0dip"
+            android:background="@drawable/status_bg"
+            android:scaleType="center"
+            android:visibility="gone" />
+
+        <LinearLayout
+            android:layout_width="0.0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1.0"
+            android:orientation="vertical"
+            android:paddingLeft="11.0dip" >
+
+            <TextView
+                android:id="@+id/trackname"
+                style="@android:style/TextAppearance.StatusBar.EventContent.Title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:ellipsize="marquee"
+                android:focusable="true"
+                android:singleLine="true" />
+
+            <TextView
+                android:id="@+id/artist"
+                style="@android:style/TextAppearance.StatusBar.EventContent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:ellipsize="end"
+                android:scrollHorizontally="true"
+                android:singleLine="true" />
+
+            <TextView
+                android:id="@+id/album"
+                style="@android:style/TextAppearance.StatusBar.EventContent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:ellipsize="end"
+                android:scrollHorizontally="true"
+                android:singleLine="true" />
+        </LinearLayout>
+
+        <ImageButton
+            android:id="@+id/control_previous"
+            android:layout_width="40dip"
+            android:layout_height="40dip"
+            android:layout_gravity="center|right"
+            android:layout_marginRight="5dip"
+            android:layout_marginTop="2dip"
+            android:layout_weight="0.0"
+            android:background="@drawable/btn_bg"
+            android:src="@drawable/status_prev" />
+
+        <ImageButton
+            android:id="@+id/control_play"
+            android:layout_width="40dip"
+            android:layout_height="40dip"
+            android:layout_gravity="center|right"
+            android:layout_marginRight="5dip"
+            android:layout_marginTop="2dip"
+            android:layout_weight="0.0"
+            android:background="@drawable/btn_bg"
+            android:src="@drawable/status_play" />
+
+        <ImageButton
+            android:id="@+id/control_next"
+            android:layout_width="40dip"
+            android:layout_height="40dip"
+            android:layout_gravity="center|right"
+            android:layout_marginRight="5dip"
+            android:layout_marginTop="2dip"
+            android:layout_weight="0.0"
+            android:background="@drawable/btn_bg"
+            android:src="@drawable/status_next" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/search.xml b/res/layout/search.xml
index 4f7d4a7f..ebd659cb 100644
--- a/res/layout/search.xml
+++ b/res/layout/search.xml
@@ -6,11 +6,6 @@
 
     <include layout="@layout/action_bar"/>
 
-    <View
-            a:layout_width="fill_parent"
-            a:layout_height="1px"
-            a:background="@color/dividerColor"/>
-
     <include layout="@layout/tab_progress"/>
 
     <ListView
diff --git a/res/layout/select_artist.xml b/res/layout/select_artist.xml
index a286ae0e..abe6c0e8 100644
--- a/res/layout/select_artist.xml
+++ b/res/layout/select_artist.xml
@@ -6,11 +6,6 @@
 
     <include layout="@layout/action_bar"/>
 
-    <View
-            a:layout_width="fill_parent"
-            a:layout_height="1dp"
-            a:background="@color/dividerColor"/>
-
     <include layout="@layout/tab_progress"/>
 
     <ListView a:id="@+id/select_artist_list"
diff --git a/res/layout/select_playlist.xml b/res/layout/select_playlist.xml
index 8d3fa6b6..6fbab1da 100644
--- a/res/layout/select_playlist.xml
+++ b/res/layout/select_playlist.xml
@@ -6,11 +6,6 @@
 
     <include layout="@layout/action_bar"/>
 
-    <View
-            a:layout_width="fill_parent"
-            a:layout_height="1px"
-            a:background="@color/dividerColor"/>
-
     <include layout="@layout/tab_progress"/>
 
     <TextView
diff --git a/res/layout/statusbar.xml b/res/layout/statusbar.xml
new file mode 100644
index 00000000..f53bf2a9
--- /dev/null
+++ b/res/layout/statusbar.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/statusbar"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="horizontal" >
+
+        <ImageView
+            android:id="@+id/icon"
+            android:layout_width="64.0dip"
+            android:layout_height="64.0dip"
+            android:layout_weight="0.0"
+            android:gravity="center" />
+
+        <ImageView
+            android:id="@+id/status_icon"
+            android:layout_width="64.0dip"
+            android:layout_height="64.0dip"
+            android:background="@drawable/status_bg"
+            android:scaleType="center"
+            android:visibility="gone" />
+
+        <LinearLayout
+            android:layout_width="0.0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1.0"
+            android:orientation="vertical"
+            android:paddingLeft="11.0dip" >
+
+            <TextView
+                android:id="@+id/trackname"
+                style="@android:style/TextAppearance.StatusBar.EventContent.Title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:ellipsize="marquee"
+                android:focusable="true"
+                android:singleLine="true" />
+
+            <TextView
+                android:id="@+id/artist"
+                style="@android:style/TextAppearance.StatusBar.EventContent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:ellipsize="end"
+                android:scrollHorizontally="true"
+                android:singleLine="true" />
+
+            <TextView
+                android:id="@+id/album"
+                style="@android:style/TextAppearance.StatusBar.EventContent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:ellipsize="end"
+                android:scrollHorizontally="true"
+                android:singleLine="true" />
+        </LinearLayout>
+
+        <ImageButton
+            android:id="@+id/status_media_prev"
+            android:layout_width="40dip"
+            android:layout_height="40dip"
+            android:layout_gravity="center|right"
+            android:layout_marginRight="5dip"
+            android:layout_marginTop="2dip"
+            android:layout_weight="0.0"
+            android:background="@drawable/btn_bg"
+            android:src="@drawable/status_prev" />
+
+        <ImageButton
+            android:id="@+id/status_media_play"
+            android:layout_width="40dip"
+            android:layout_height="40dip"
+            android:layout_gravity="center|right"
+            android:layout_marginRight="5dip"
+            android:layout_marginTop="2dip"
+            android:layout_weight="0.0"
+            android:background="@drawable/btn_bg"
+            android:src="@drawable/status_play" />
+
+        <ImageButton
+            android:id="@+id/status_media_next"
+            android:layout_width="40dip"
+            android:layout_height="40dip"
+            android:layout_gravity="center|right"
+            android:layout_marginRight="5dip"
+            android:layout_marginTop="2dip"
+            android:layout_weight="0.0"
+            android:background="@drawable/btn_bg"
+            android:src="@drawable/status_next" />
+
+        <ImageButton
+            android:id="@+id/status_media_collapse"
+            android:layout_width="40dip"
+            android:layout_height="40dip"
+            android:layout_gravity="center|right"
+            android:layout_marginRight="5dip"
+            android:layout_marginTop="2dip"
+            android:layout_weight="0.0"
+            android:background="@drawable/btn_bg"
+            android:src="@drawable/btn_collapse_group_normal_holo_dark" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index d0238e35..53e8b0e4 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -11,5 +11,7 @@
     <color name="white">#ffffffff</color>
     <color name="black">#ff000000</color>
     <color name="transparent">#00000000</color>
+    <color name="grey">#ffe0e0e0</color>
     <color name="cyan">#ff0099cc</color>
+    <color name="ics_opaque">#8033b5e5</color>
 </resources>
\ No newline at end of file
diff --git a/res/values/integers.xml b/res/values/integers.xml
new file mode 100644
index 00000000..82a991a3
--- /dev/null
+++ b/res/values/integers.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    
+    <integer name="config_activityShortDur">150</integer>
+    <integer name="config_activityDefaultDur">220</integer>
+    
+</resources>
\ No newline at end of file
diff --git a/res/xml/appwidget_info.xml b/res/xml/appwidget_info_4x1.xml
similarity index 85%
rename from res/xml/appwidget_info.xml
rename to res/xml/appwidget_info_4x1.xml
index ae24d976..59b755ad 100644
--- a/res/xml/appwidget_info.xml
+++ b/res/xml/appwidget_info_4x1.xml
@@ -5,4 +5,4 @@
                     a:updatePeriodMillis="0"
                     a:resizeMode="horizontal|vertical"
                     a:previewImage="@drawable/preview"
-                    a:initialLayout="@layout/appwidget"/>
\ No newline at end of file
+                    a:initialLayout="@layout/appwidget4x1"/>
\ No newline at end of file
diff --git a/src/net/sourceforge/subsonic/androidapp/provider/SubsonicAppWidgetProvider.java b/src/net/sourceforge/subsonic/androidapp/provider/SubsonicAppWidgetProvider4x1.java
similarity index 95%
rename from src/net/sourceforge/subsonic/androidapp/provider/SubsonicAppWidgetProvider.java
rename to src/net/sourceforge/subsonic/androidapp/provider/SubsonicAppWidgetProvider4x1.java
index 6c505d18..b1c42945 100644
--- a/src/net/sourceforge/subsonic/androidapp/provider/SubsonicAppWidgetProvider.java
+++ b/src/net/sourceforge/subsonic/androidapp/provider/SubsonicAppWidgetProvider4x1.java
@@ -53,14 +53,14 @@ import net.sourceforge.subsonic.androidapp.util.FileUtil;
  *
  * @author Sindre Mehus
  */
-public class SubsonicAppWidgetProvider extends AppWidgetProvider {
+public class SubsonicAppWidgetProvider4x1 extends AppWidgetProvider {
 
-    private static SubsonicAppWidgetProvider instance;
-    private static final String TAG = SubsonicAppWidgetProvider.class.getSimpleName();
+    private static SubsonicAppWidgetProvider4x1 instance;
+    private static final String TAG = SubsonicAppWidgetProvider4x1.class.getSimpleName();
 
-    public static synchronized SubsonicAppWidgetProvider getInstance() {
+    public static synchronized SubsonicAppWidgetProvider4x1 getInstance() {
         if (instance == null) {
-            instance = new SubsonicAppWidgetProvider();
+            instance = new SubsonicAppWidgetProvider4x1();
         }
         return instance;
     }
@@ -76,7 +76,7 @@ public class SubsonicAppWidgetProvider extends AppWidgetProvider {
      */
     private void defaultAppWidget(Context context, int[] appWidgetIds) {
         final Resources res = context.getResources();
-        final RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.appwidget);
+        final RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.appwidget4x1);
 
         views.setTextViewText(R.id.artist, res.getText(R.string.widget_initial_text));
 
@@ -117,7 +117,7 @@ public class SubsonicAppWidgetProvider extends AppWidgetProvider {
      */
     private void performUpdate(Context context, DownloadService service, int[] appWidgetIds, boolean playing) {
         final Resources res = context.getResources();
-        final RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.appwidget);
+        final RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.appwidget4x1);
 
         MusicDirectory.Entry currentPlaying = service.getCurrentPlaying() == null ? null : service.getCurrentPlaying().getSong();
         String title = currentPlaying == null ? null : currentPlaying.getTitle();
diff --git a/src/net/sourceforge/subsonic/androidapp/util/Util.java b/src/net/sourceforge/subsonic/androidapp/util/Util.java
index 47a22846..eca5ccdf 100644
--- a/src/net/sourceforge/subsonic/androidapp/util/Util.java
+++ b/src/net/sourceforge/subsonic/androidapp/util/Util.java
@@ -24,6 +24,7 @@ import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
+import android.appwidget.AppWidgetProvider;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -40,15 +41,17 @@ import android.os.Environment;
 import android.os.Handler;
 import android.util.Log;
 import android.view.Gravity;
+import android.view.KeyEvent;
 import android.widget.RemoteViews;
 import android.widget.Toast;
 import net.sourceforge.subsonic.androidapp.R;
 import net.sourceforge.subsonic.androidapp.activity.DownloadActivity;
+import net.sourceforge.subsonic.androidapp.activity.MainActivity;
 import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
 import net.sourceforge.subsonic.androidapp.domain.PlayerState;
 import net.sourceforge.subsonic.androidapp.domain.RepeatMode;
 import net.sourceforge.subsonic.androidapp.domain.Version;
-import net.sourceforge.subsonic.androidapp.provider.SubsonicAppWidgetProvider;
+import net.sourceforge.subsonic.androidapp.provider.SubsonicAppWidgetProvider4x1;
 import net.sourceforge.subsonic.androidapp.receiver.MediaButtonIntentReceiver;
 import net.sourceforge.subsonic.androidapp.service.DownloadServiceImpl;
 import org.apache.http.HttpEntity;
@@ -74,7 +77,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * @author Sindre Mehus
  * @version $Id$
  */
-public final class Util {
+public class Util extends DownloadActivity {
 
     private static final String TAG = Util.class.getSimpleName();
 
@@ -566,6 +569,7 @@ public final class Util {
         // Use the same text for the ticker and the expanded notification
         String title = song.getTitle();
         String text = song.getArtist();
+        String album = song.getAlbum();
         
         // Set the icon, scrolling text and timestamp
         final Notification notification = new Notification(R.drawable.ic_stat_subsonic, title, System.currentTimeMillis());
@@ -589,8 +593,9 @@ public final class Util {
 		}
 
 		// set the text for the notifications
-        contentView.setTextViewText(R.id.notification_title, title);
-        contentView.setTextViewText(R.id.notification_artist, text);
+        contentView.setTextViewText(R.id.trackname, title);
+        contentView.setTextViewText(R.id.artist, text);
+        contentView.setTextViewText(R.id.album, album);
         
         notification.contentView = contentView;  
         
@@ -606,7 +611,8 @@ public final class Util {
         });
 
         // Update widget
-        SubsonicAppWidgetProvider.getInstance().notifyChange(context, downloadService, true);
+        linkButtons(context, contentView, false);
+        SubsonicAppWidgetProvider4x1.getInstance().notifyChange(context, downloadService, true);
     }
 
     public static void hidePlayingNotification(final Context context, final DownloadServiceImpl downloadService, Handler handler) {
@@ -620,7 +626,7 @@ public final class Util {
         });
 
         // Update widget
-        SubsonicAppWidgetProvider.getInstance().notifyChange(context, downloadService, false);
+        SubsonicAppWidgetProvider4x1.getInstance().notifyChange(context, downloadService, false);
     }
 
     public static void sleepQuietly(long millis) {
@@ -773,4 +779,31 @@ public final class Util {
 
         context.sendBroadcast(intent);
     }
+    
+    private static void linkButtons(Context context, RemoteViews views, boolean playerActive) {
+
+        Intent intent = new Intent(context, playerActive ? DownloadActivity.class : MainActivity.class);
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
+        views.setOnClickPendingIntent(R.id.appwidget_coverart, pendingIntent);
+        views.setOnClickPendingIntent(R.id.appwidget_top, pendingIntent);
+        
+        // Emulate media button clicks.
+        intent = new Intent("1");
+        intent.setComponent(new ComponentName(context, DownloadServiceImpl.class));
+        intent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE));
+        pendingIntent = PendingIntent.getService(context, 0, intent, 0);
+        views.setOnClickPendingIntent(R.id.control_play, pendingIntent);
+
+        intent = new Intent("2");  // Use a unique action name to ensure a different PendingIntent to be created.
+        intent.setComponent(new ComponentName(context, DownloadServiceImpl.class));
+        intent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_NEXT));
+        pendingIntent = PendingIntent.getService(context, 0, intent, 0);
+        views.setOnClickPendingIntent(R.id.control_next, pendingIntent);
+        
+        intent = new Intent("3");  // Use a unique action name to ensure a different PendingIntent to be created.
+        intent.setComponent(new ComponentName(context, DownloadServiceImpl.class));
+        intent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_PREVIOUS));
+        pendingIntent = PendingIntent.getService(context, 0, intent, 0);
+        views.setOnClickPendingIntent(R.id.control_previous, pendingIntent);
+    }
 }