Merge changes

366 files changed, 1388 insertions, 980 deletions

diff --git a/res/drawable-hdpi-v11/notification_close.png b/res/drawable-hdpi-v11/notification_close.png
new file mode 100644
index 00000000..254e130f
--- /dev/null
+++ b/res/drawable-hdpi-v11/notification_close.png
diff --git a/res/drawable-hdpi-v11/notification_next.png b/res/drawable-hdpi-v11/notification_next.png
new file mode 100644
index 00000000..59239305
--- /dev/null
+++ b/res/drawable-hdpi-v11/notification_next.png
diff --git a/res/drawable-hdpi-v11/notification_pause.png b/res/drawable-hdpi-v11/notification_pause.png
new file mode 100644
index 00000000..cbd61795
--- /dev/null
+++ b/res/drawable-hdpi-v11/notification_pause.png
diff --git a/res/drawable-hdpi-v11/notification_play.png b/res/drawable-hdpi-v11/notification_play.png
new file mode 100644
index 00000000..78b4d5bf
--- /dev/null
+++ b/res/drawable-hdpi-v11/notification_play.png
diff --git a/res/drawable-hdpi-v11/notification_previous.png b/res/drawable-hdpi-v11/notification_previous.png
new file mode 100644
index 00000000..556eaec3
--- /dev/null
+++ b/res/drawable-hdpi-v11/notification_previous.png
diff --git a/res/drawable-hdpi-v11/stat_notify_download.png b/res/drawable-hdpi-v11/stat_notify_download.png
new file mode 100644
index 00000000..48ca6924
--- /dev/null
+++ b/res/drawable-hdpi-v11/stat_notify_download.png
diff --git a/res/drawable-hdpi-v11/stat_notify_playing.png b/res/drawable-hdpi-v11/stat_notify_playing.png
new file mode 100644
index 00000000..78b4d5bf
--- /dev/null
+++ b/res/drawable-hdpi-v11/stat_notify_playing.png
diff --git a/res/drawable-hdpi/action_browse.png b/res/drawable-hdpi/action_browse.png
deleted file mode 100644
index 54296909..00000000
--- a/res/drawable-hdpi/action_browse.png
+++ /dev/null
diff --git a/res/drawable-hdpi/action_compass.png b/res/drawable-hdpi/action_compass.png
deleted file mode 100644
index 39760f89..00000000
--- a/res/drawable-hdpi/action_compass.png
+++ /dev/null
diff --git a/res/drawable-hdpi/action_exit.png b/res/drawable-hdpi/action_exit.png
deleted file mode 100644
index 09e18dee..00000000
--- a/res/drawable-hdpi/action_exit.png
+++ /dev/null
diff --git a/res/drawable-hdpi/action_help.png b/res/drawable-hdpi/action_help.png
deleted file mode 100644
index aaf8304c..00000000
--- a/res/drawable-hdpi/action_help.png
+++ /dev/null
diff --git a/res/drawable-hdpi/action_moreoverflow.png b/res/drawable-hdpi/action_moreoverflow.png
deleted file mode 100644
index cb6ebdaf..00000000
--- a/res/drawable-hdpi/action_moreoverflow.png
+++ /dev/null
diff --git a/res/drawable-hdpi/action_offline.png b/res/drawable-hdpi/action_offline.png
deleted file mode 100644
index a85f0931..00000000
--- a/res/drawable-hdpi/action_offline.png
+++ /dev/null
diff --git a/res/drawable-hdpi/action_play_all.png b/res/drawable-hdpi/action_play_all.png
deleted file mode 100644
index 6ce5629a..00000000
--- a/res/drawable-hdpi/action_play_all.png
+++ /dev/null
diff --git a/res/drawable-hdpi/action_refresh.png b/res/drawable-hdpi/action_refresh.png
deleted file mode 100644
index 9f30dc95..00000000
--- a/res/drawable-hdpi/action_refresh.png
+++ /dev/null
diff --git a/res/drawable-hdpi/action_remove_all.png b/res/drawable-hdpi/action_remove_all.png
deleted file mode 100644
index 97b88837..00000000
--- a/res/drawable-hdpi/action_remove_all.png
+++ /dev/null
diff --git a/res/drawable-hdpi/action_save.png b/res/drawable-hdpi/action_save.png
deleted file mode 100644
index 7bda97d6..00000000
--- a/res/drawable-hdpi/action_save.png
+++ /dev/null
diff --git a/res/drawable-hdpi/action_screen_on_off.png b/res/drawable-hdpi/action_screen_on_off.png
deleted file mode 100644
index c7168563..00000000
--- a/res/drawable-hdpi/action_screen_on_off.png
+++ /dev/null
diff --git a/res/drawable-hdpi/action_search.png b/res/drawable-hdpi/action_search.png
deleted file mode 100644
index 6bc3d426..00000000
--- a/res/drawable-hdpi/action_search.png
+++ /dev/null
diff --git a/res/drawable-hdpi/action_select.png b/res/drawable-hdpi/action_select.png
deleted file mode 100644
index e9e83e3d..00000000
--- a/res/drawable-hdpi/action_select.png
+++ /dev/null
diff --git a/res/drawable-hdpi/action_settings.png b/res/drawable-hdpi/action_settings.png
deleted file mode 100644
index 1ab7722b..00000000
--- a/res/drawable-hdpi/action_settings.png
+++ /dev/null
diff --git a/res/drawable-hdpi/action_share.png b/res/drawable-hdpi/action_share.png
deleted file mode 100644
index 28376157..00000000
--- a/res/drawable-hdpi/action_share.png
+++ /dev/null
diff --git a/res/drawable-hdpi/action_shuffle.png b/res/drawable-hdpi/action_shuffle.png
deleted file mode 100644
index 0613965c..00000000
--- a/res/drawable-hdpi/action_shuffle.png
+++ /dev/null
diff --git a/res/drawable-hdpi/action_toggle_list.png b/res/drawable-hdpi/action_toggle_list.png
deleted file mode 100644
index 87f9280f..00000000
--- a/res/drawable-hdpi/action_toggle_list.png
+++ /dev/null
diff --git a/res/drawable-hdpi/action_toggle_list_dark.png b/res/drawable-hdpi/action_toggle_list_dark.png
new file mode 100644
index 00000000..d0ec1a5d
--- /dev/null
+++ b/res/drawable-hdpi/action_toggle_list_dark.png
diff --git a/res/drawable-hdpi/action_toggle_list_light.png b/res/drawable-hdpi/action_toggle_list_light.png
new file mode 100644
index 00000000..60ec88be
--- /dev/null
+++ b/res/drawable-hdpi/action_toggle_list_light.png
diff --git a/res/drawable-hdpi/actionbar_background.9.png b/res/drawable-hdpi/actionbar_background.9.png
deleted file mode 100644
index 9ce38a61..00000000
--- a/res/drawable-hdpi/actionbar_background.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/album_art_background.png b/res/drawable-hdpi/album_art_background.png
deleted file mode 100644
index f0757695..00000000
--- a/res/drawable-hdpi/album_art_background.png
+++ /dev/null
diff --git a/res/drawable-hdpi/download_cached.png b/res/drawable-hdpi/download_cached.png
new file mode 100644
index 00000000..d935cb2c
--- /dev/null
+++ b/res/drawable-hdpi/download_cached.png
diff --git a/res/drawable-hdpi/download_none_dark.png b/res/drawable-hdpi/download_none_dark.png
new file mode 100644
index 00000000..a074c10d
--- /dev/null
+++ b/res/drawable-hdpi/download_none_dark.png
diff --git a/res/drawable-hdpi/download_none_light.png b/res/drawable-hdpi/download_none_light.png
new file mode 100644
index 00000000..21544e5f
--- /dev/null
+++ b/res/drawable-hdpi/download_none_light.png
diff --git a/res/drawable-hdpi/download_pinned.png b/res/drawable-hdpi/download_pinned.png
new file mode 100644
index 00000000..b5b6dfb1
--- /dev/null
+++ b/res/drawable-hdpi/download_pinned.png
diff --git a/res/drawable-hdpi/downloading.png b/res/drawable-hdpi/downloading.png
deleted file mode 100644
index afff39a9..00000000
--- a/res/drawable-hdpi/downloading.png
+++ /dev/null
diff --git a/res/drawable-hdpi/downloading_dark.png b/res/drawable-hdpi/downloading_dark.png
new file mode 100644
index 00000000..3ccb1837
--- /dev/null
+++ b/res/drawable-hdpi/downloading_dark.png
diff --git a/res/drawable-hdpi/downloading_light.png b/res/drawable-hdpi/downloading_light.png
new file mode 100644
index 00000000..07be3016
--- /dev/null
+++ b/res/drawable-hdpi/downloading_light.png
diff --git a/res/drawable-hdpi/ic_action_volume_dark.png b/res/drawable-hdpi/ic_action_volume_dark.png
new file mode 100644
index 00000000..62550655
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_volume_dark.png
diff --git a/res/drawable-hdpi/ic_action_volume_light.png b/res/drawable-hdpi/ic_action_volume_light.png
new file mode 100644
index 00000000..1b1d182c
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_volume_light.png
diff --git a/res/drawable-hdpi/ic_drawer.png b/res/drawable-hdpi/ic_drawer.png
new file mode 100644
index 00000000..c59f601c
--- /dev/null
+++ b/res/drawable-hdpi/ic_drawer.png
diff --git a/res/drawable-hdpi/ic_menu_bookmark_dark.png b/res/drawable-hdpi/ic_menu_bookmark_dark.png
new file mode 100644
index 00000000..e7cd08e4
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_bookmark_dark.png
diff --git a/res/drawable-hdpi/ic_menu_bookmark_light.png b/res/drawable-hdpi/ic_menu_bookmark_light.png
new file mode 100644
index 00000000..fdb46da3
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_bookmark_light.png
diff --git a/res/drawable-hdpi/ic_menu_chat_dark.png b/res/drawable-hdpi/ic_menu_chat_dark.png
index be04b06e..75363fce 100644
--- a/res/drawable-hdpi/ic_menu_chat_dark.png
+++ b/res/drawable-hdpi/ic_menu_chat_dark.png
diff --git a/res/drawable-hdpi/ic_menu_chat_light.png b/res/drawable-hdpi/ic_menu_chat_light.png
index 3f58695c..e28933e4 100644
--- a/res/drawable-hdpi/ic_menu_chat_light.png
+++ b/res/drawable-hdpi/ic_menu_chat_light.png
diff --git a/res/drawable-hdpi/ic_menu_chat_send_dark.png b/res/drawable-hdpi/ic_menu_chat_send_dark.png
index bd37dc59..c0e9b372 100644
--- a/res/drawable-hdpi/ic_menu_chat_send_dark.png
+++ b/res/drawable-hdpi/ic_menu_chat_send_dark.png
diff --git a/res/drawable-hdpi/ic_menu_chat_send_light.png b/res/drawable-hdpi/ic_menu_chat_send_light.png
index 0c870d2c..ebcfe9e8 100644
--- a/res/drawable-hdpi/ic_menu_chat_send_light.png
+++ b/res/drawable-hdpi/ic_menu_chat_send_light.png
diff --git a/res/drawable-hdpi/ic_menu_exit.png b/res/drawable-hdpi/ic_menu_exit.png
deleted file mode 100644
index 847a1ed3..00000000
--- a/res/drawable-hdpi/ic_menu_exit.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_menu_help.png b/res/drawable-hdpi/ic_menu_help.png
deleted file mode 100644
index 9f11f434..00000000
--- a/res/drawable-hdpi/ic_menu_help.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_menu_library_dark.png b/res/drawable-hdpi/ic_menu_library_dark.png
new file mode 100644
index 00000000..717cb3e1
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_library_dark.png
diff --git a/res/drawable-hdpi/ic_menu_library_light.png b/res/drawable-hdpi/ic_menu_library_light.png
new file mode 100644
index 00000000..17a45d77
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_library_light.png
diff --git a/res/drawable-hdpi/ic_menu_playlist_dark.png b/res/drawable-hdpi/ic_menu_playlist_dark.png
new file mode 100644
index 00000000..8e3babc7
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_playlist_dark.png
diff --git a/res/drawable-hdpi/ic_menu_playlist_light.png b/res/drawable-hdpi/ic_menu_playlist_light.png
new file mode 100644
index 00000000..4131dba4
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_playlist_light.png
diff --git a/res/drawable-hdpi/ic_menu_podcast_dark.png b/res/drawable-hdpi/ic_menu_podcast_dark.png
new file mode 100644
index 00000000..d1d62d03
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_podcast_dark.png
diff --git a/res/drawable-hdpi/ic_menu_podcast_light.png b/res/drawable-hdpi/ic_menu_podcast_light.png
new file mode 100644
index 00000000..4ce1b787
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_podcast_light.png
diff --git a/res/drawable-hdpi/ic_menu_refresh_dark.png b/res/drawable-hdpi/ic_menu_refresh_dark.png
new file mode 100644
index 00000000..2795cfa9
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_refresh_dark.png
diff --git a/res/drawable-hdpi/ic_menu_refresh_light.png b/res/drawable-hdpi/ic_menu_refresh_light.png
new file mode 100644
index 00000000..86d1b042
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_refresh_light.png
diff --git a/res/drawable-hdpi/ic_menu_remove_dark.png b/res/drawable-hdpi/ic_menu_remove_dark.png
new file mode 100644
index 00000000..878b378a
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_remove_dark.png
diff --git a/res/drawable-hdpi/ic_menu_remove_light.png b/res/drawable-hdpi/ic_menu_remove_light.png
new file mode 100644
index 00000000..ece5ad8d
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_remove_light.png
diff --git a/res/drawable-hdpi/ic_menu_save_dark.png b/res/drawable-hdpi/ic_menu_save_dark.png
new file mode 100644
index 00000000..b80828bf
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_save_dark.png
diff --git a/res/drawable-hdpi/ic_menu_save_light.png b/res/drawable-hdpi/ic_menu_save_light.png
new file mode 100644
index 00000000..a3a5e23a
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_save_light.png
diff --git a/res/drawable-hdpi/ic_menu_search_dark.png b/res/drawable-hdpi/ic_menu_search_dark.png
new file mode 100644
index 00000000..ef2b3013
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_search_dark.png
diff --git a/res/drawable-hdpi/ic_menu_search_light.png b/res/drawable-hdpi/ic_menu_search_light.png
new file mode 100644
index 00000000..756937df
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_search_light.png
diff --git a/res/drawable-hdpi/ic_menu_settings.png b/res/drawable-hdpi/ic_menu_settings.png
deleted file mode 100644
index 48775c1e..00000000
--- a/res/drawable-hdpi/ic_menu_settings.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_menu_settings_dark.png b/res/drawable-hdpi/ic_menu_settings_dark.png
new file mode 100644
index 00000000..d6dd17ec
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_settings_dark.png
diff --git a/res/drawable-hdpi/ic_menu_settings_light.png b/res/drawable-hdpi/ic_menu_settings_light.png
new file mode 100644
index 00000000..70c29951
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_settings_light.png
diff --git a/res/drawable-hdpi/ic_menu_shuffle.png b/res/drawable-hdpi/ic_menu_shuffle.png
deleted file mode 100644
index 0613965c..00000000
--- a/res/drawable-hdpi/ic_menu_shuffle.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_menu_shuffle_dark.png b/res/drawable-hdpi/ic_menu_shuffle_dark.png
new file mode 100644
index 00000000..f77cfed2
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_shuffle_dark.png
diff --git a/res/drawable-hdpi/ic_menu_shuffle_light.png b/res/drawable-hdpi/ic_menu_shuffle_light.png
new file mode 100644
index 00000000..ded93939
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_shuffle_light.png
diff --git a/res/drawable-hdpi/launch.png b/res/drawable-hdpi/launch.png
index 72f80486..9caa6675 100644
--- a/res/drawable-hdpi/launch.png
+++ b/res/drawable-hdpi/launch.png
diff --git a/res/drawable-hdpi/list_item_more.9.png b/res/drawable-hdpi/list_item_more.9.png
deleted file mode 100644
index 79ca860d..00000000
--- a/res/drawable-hdpi/list_item_more.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/list_item_more_saved.9.png b/res/drawable-hdpi/list_item_more_saved.9.png
deleted file mode 100644
index f3805bfb..00000000
--- a/res/drawable-hdpi/list_item_more_saved.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/list_item_more_shaded.9.png b/res/drawable-hdpi/list_item_more_shaded.9.png
deleted file mode 100644
index 99c2f5b8..00000000
--- a/res/drawable-hdpi/list_item_more_shaded.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/main_offline.png b/res/drawable-hdpi/main_offline.png
deleted file mode 100644
index a1d27cec..00000000
--- a/res/drawable-hdpi/main_offline.png
+++ /dev/null
diff --git a/res/drawable-hdpi/main_offline_dark.png b/res/drawable-hdpi/main_offline_dark.png
new file mode 100644
index 00000000..a594530d
--- /dev/null
+++ b/res/drawable-hdpi/main_offline_dark.png
diff --git a/res/drawable-hdpi/main_offline_light.png b/res/drawable-hdpi/main_offline_light.png
index 69bee782..cabca581 100644
--- a/res/drawable-hdpi/main_offline_light.png
+++ b/res/drawable-hdpi/main_offline_light.png
diff --git a/res/drawable-hdpi/main_select_server.png b/res/drawable-hdpi/main_select_server.png
deleted file mode 100644
index c2cefead..00000000
--- a/res/drawable-hdpi/main_select_server.png
+++ /dev/null
diff --git a/res/drawable-hdpi/main_select_server_dark.png b/res/drawable-hdpi/main_select_server_dark.png
new file mode 100644
index 00000000..e3a9dd5d
--- /dev/null
+++ b/res/drawable-hdpi/main_select_server_dark.png
diff --git a/res/drawable-hdpi/main_select_server_light.png b/res/drawable-hdpi/main_select_server_light.png
new file mode 100644
index 00000000..4606410d
--- /dev/null
+++ b/res/drawable-hdpi/main_select_server_light.png
diff --git a/res/drawable-hdpi/media_backward.png b/res/drawable-hdpi/media_backward.png
deleted file mode 100644
index 3bb85e68..00000000
--- a/res/drawable-hdpi/media_backward.png
+++ /dev/null
diff --git a/res/drawable-hdpi/media_backward_dark.png b/res/drawable-hdpi/media_backward_dark.png
new file mode 100644
index 00000000..b1dde4f5
--- /dev/null
+++ b/res/drawable-hdpi/media_backward_dark.png
diff --git a/res/drawable-hdpi/media_backward_light.png b/res/drawable-hdpi/media_backward_light.png
index 14188c86..3e277267 100644
--- a/res/drawable-hdpi/media_backward_light.png
+++ b/res/drawable-hdpi/media_backward_light.png
diff --git a/res/drawable-hdpi/media_forward.png b/res/drawable-hdpi/media_forward.png
deleted file mode 100644
index cf39f1f0..00000000
--- a/res/drawable-hdpi/media_forward.png
+++ /dev/null
diff --git a/res/drawable-hdpi/media_forward_dark.png b/res/drawable-hdpi/media_forward_dark.png
new file mode 100644
index 00000000..eb2546c7
--- /dev/null
+++ b/res/drawable-hdpi/media_forward_dark.png
diff --git a/res/drawable-hdpi/media_forward_light.png b/res/drawable-hdpi/media_forward_light.png
index 9e172d8f..185e3c39 100644
--- a/res/drawable-hdpi/media_forward_light.png
+++ b/res/drawable-hdpi/media_forward_light.png
diff --git a/res/drawable-hdpi/media_pause.png b/res/drawable-hdpi/media_pause.png
deleted file mode 100644
index d4cab525..00000000
--- a/res/drawable-hdpi/media_pause.png
+++ /dev/null
diff --git a/res/drawable-hdpi/media_pause_dark.png b/res/drawable-hdpi/media_pause_dark.png
new file mode 100644
index 00000000..b057588e
--- /dev/null
+++ b/res/drawable-hdpi/media_pause_dark.png
diff --git a/res/drawable-hdpi/media_pause_light.png b/res/drawable-hdpi/media_pause_light.png
index 8ebf9b45..e01815e3 100644
--- a/res/drawable-hdpi/media_pause_light.png
+++ b/res/drawable-hdpi/media_pause_light.png
diff --git a/res/drawable-hdpi/media_start.png b/res/drawable-hdpi/media_start.png
deleted file mode 100644
index 2af5996f..00000000
--- a/res/drawable-hdpi/media_start.png
+++ /dev/null
diff --git a/res/drawable-hdpi/media_start_dark.png b/res/drawable-hdpi/media_start_dark.png
new file mode 100644
index 00000000..dbfd337a
--- /dev/null
+++ b/res/drawable-hdpi/media_start_dark.png
diff --git a/res/drawable-hdpi/media_start_light.png b/res/drawable-hdpi/media_start_light.png
index 45cad73c..e4310efc 100644
--- a/res/drawable-hdpi/media_start_light.png
+++ b/res/drawable-hdpi/media_start_light.png
diff --git a/res/drawable-hdpi/media_stop.png b/res/drawable-hdpi/media_stop.png
deleted file mode 100644
index 329eb906..00000000
--- a/res/drawable-hdpi/media_stop.png
+++ /dev/null
diff --git a/res/drawable-hdpi/media_stop_dark.png b/res/drawable-hdpi/media_stop_dark.png
new file mode 100644
index 00000000..5ceb39f3
--- /dev/null
+++ b/res/drawable-hdpi/media_stop_dark.png
diff --git a/res/drawable-hdpi/media_stop_light.png b/res/drawable-hdpi/media_stop_light.png
index 110d538e..8deca73e 100644
--- a/res/drawable-hdpi/media_stop_light.png
+++ b/res/drawable-hdpi/media_stop_light.png
diff --git a/res/drawable-hdpi/menu_browse.png b/res/drawable-hdpi/menu_browse.png
deleted file mode 100644
index 54296909..00000000
--- a/res/drawable-hdpi/menu_browse.png
+++ /dev/null
diff --git a/res/drawable-hdpi/menu_home.png b/res/drawable-hdpi/menu_home.png
deleted file mode 100644
index 3cec6246..00000000
--- a/res/drawable-hdpi/menu_home.png
+++ /dev/null
diff --git a/res/drawable-hdpi/menu_now_playing.png b/res/drawable-hdpi/menu_now_playing.png
deleted file mode 100644
index 6ce5629a..00000000
--- a/res/drawable-hdpi/menu_now_playing.png
+++ /dev/null
diff --git a/res/drawable-hdpi/menu_playlists.png b/res/drawable-hdpi/menu_playlists.png
deleted file mode 100644
index e9e83e3d..00000000
--- a/res/drawable-hdpi/menu_playlists.png
+++ /dev/null
diff --git a/res/drawable-hdpi/notification_close.png b/res/drawable-hdpi/notification_close.png
new file mode 100644
index 00000000..916c9a0f
--- /dev/null
+++ b/res/drawable-hdpi/notification_close.png
diff --git a/res/drawable-hdpi/notification_next.png b/res/drawable-hdpi/notification_next.png
index 5835f654..078c310f 100644
--- a/res/drawable-hdpi/notification_next.png
+++ b/res/drawable-hdpi/notification_next.png
diff --git a/res/drawable-hdpi/notification_pause.png b/res/drawable-hdpi/notification_pause.png
index 3324f88f..16627e44 100644
--- a/res/drawable-hdpi/notification_pause.png
+++ b/res/drawable-hdpi/notification_pause.png
diff --git a/res/drawable-hdpi/notification_play.png b/res/drawable-hdpi/notification_play.png
index 8c95b6a5..02f38944 100644
--- a/res/drawable-hdpi/notification_play.png
+++ b/res/drawable-hdpi/notification_play.png
diff --git a/res/drawable-hdpi/notification_prev.png b/res/drawable-hdpi/notification_prev.png
deleted file mode 100644
index 73fb16f2..00000000
--- a/res/drawable-hdpi/notification_prev.png
+++ /dev/null
diff --git a/res/drawable-hdpi/notification_previous.png b/res/drawable-hdpi/notification_previous.png
new file mode 100644
index 00000000..9d10abd9
--- /dev/null
+++ b/res/drawable-hdpi/notification_previous.png
diff --git a/res/drawable-hdpi/notification_stop.png b/res/drawable-hdpi/notification_stop.png
deleted file mode 100644
index ab98e188..00000000
--- a/res/drawable-hdpi/notification_stop.png
+++ /dev/null
diff --git a/res/drawable-hdpi/now_playing.png b/res/drawable-hdpi/now_playing.png
new file mode 100644
index 00000000..02f38944
--- /dev/null
+++ b/res/drawable-hdpi/now_playing.png
diff --git a/res/drawable-hdpi/refresh.png b/res/drawable-hdpi/refresh.png
deleted file mode 100644
index 2f887c26..00000000
--- a/res/drawable-hdpi/refresh.png
+++ /dev/null
diff --git a/res/drawable-hdpi/search.png b/res/drawable-hdpi/search.png
deleted file mode 100644
index 43d8c87e..00000000
--- a/res/drawable-hdpi/search.png
+++ /dev/null
diff --git a/res/drawable-hdpi/stat_notify_download.png b/res/drawable-hdpi/stat_notify_download.png
new file mode 100644
index 00000000..aa1b6c92
--- /dev/null
+++ b/res/drawable-hdpi/stat_notify_download.png
diff --git a/res/drawable-hdpi/stat_notify_playing.png b/res/drawable-hdpi/stat_notify_playing.png
index bfd3e6a5..02f38944 100644
--- a/res/drawable-hdpi/stat_notify_playing.png
+++ b/res/drawable-hdpi/stat_notify_playing.png
diff --git a/res/drawable-hdpi/volume.png b/res/drawable-hdpi/volume.png
deleted file mode 100644
index 95134dfd..00000000
--- a/res/drawable-hdpi/volume.png
+++ /dev/null
diff --git a/res/drawable-mdpi-v11/notification_close.png b/res/drawable-mdpi-v11/notification_close.png
new file mode 100644
index 00000000..a056fe61
--- /dev/null
+++ b/res/drawable-mdpi-v11/notification_close.png
diff --git a/res/drawable-mdpi-v11/notification_next.png b/res/drawable-mdpi-v11/notification_next.png
new file mode 100644
index 00000000..7297577f
--- /dev/null
+++ b/res/drawable-mdpi-v11/notification_next.png
diff --git a/res/drawable-mdpi-v11/notification_pause.png b/res/drawable-mdpi-v11/notification_pause.png
new file mode 100644
index 00000000..5d3ca3f2
--- /dev/null
+++ b/res/drawable-mdpi-v11/notification_pause.png
diff --git a/res/drawable-mdpi-v11/notification_play.png b/res/drawable-mdpi-v11/notification_play.png
new file mode 100644
index 00000000..999ce798
--- /dev/null
+++ b/res/drawable-mdpi-v11/notification_play.png
diff --git a/res/drawable-mdpi-v11/notification_previous.png b/res/drawable-mdpi-v11/notification_previous.png
new file mode 100644
index 00000000..55a1f326
--- /dev/null
+++ b/res/drawable-mdpi-v11/notification_previous.png
diff --git a/res/drawable-mdpi-v11/stat_notify_download.png b/res/drawable-mdpi-v11/stat_notify_download.png
new file mode 100644
index 00000000..4164e0fa
--- /dev/null
+++ b/res/drawable-mdpi-v11/stat_notify_download.png
diff --git a/res/drawable-mdpi-v11/stat_notify_playing.png b/res/drawable-mdpi-v11/stat_notify_playing.png
new file mode 100644
index 00000000..999ce798
--- /dev/null
+++ b/res/drawable-mdpi-v11/stat_notify_playing.png
diff --git a/res/drawable-mdpi/action_toggle_list_dark.png b/res/drawable-mdpi/action_toggle_list_dark.png
new file mode 100644
index 00000000..ace7fcee
--- /dev/null
+++ b/res/drawable-mdpi/action_toggle_list_dark.png
diff --git a/res/drawable-mdpi/action_toggle_list_light.png b/res/drawable-mdpi/action_toggle_list_light.png
new file mode 100644
index 00000000..fa6432da
--- /dev/null
+++ b/res/drawable-mdpi/action_toggle_list_light.png
diff --git a/res/drawable-mdpi/download_cached.png b/res/drawable-mdpi/download_cached.png
new file mode 100644
index 00000000..fa02cc7c
--- /dev/null
+++ b/res/drawable-mdpi/download_cached.png
diff --git a/res/drawable-mdpi/download_none_dark.png b/res/drawable-mdpi/download_none_dark.png
new file mode 100644
index 00000000..b6d614fc
--- /dev/null
+++ b/res/drawable-mdpi/download_none_dark.png
diff --git a/res/drawable-mdpi/download_none_light.png b/res/drawable-mdpi/download_none_light.png
new file mode 100644
index 00000000..2485c570
--- /dev/null
+++ b/res/drawable-mdpi/download_none_light.png
diff --git a/res/drawable-mdpi/download_pinned.png b/res/drawable-mdpi/download_pinned.png
new file mode 100644
index 00000000..8e6e8e7a
--- /dev/null
+++ b/res/drawable-mdpi/download_pinned.png
diff --git a/res/drawable-mdpi/downloading_dark.png b/res/drawable-mdpi/downloading_dark.png
new file mode 100644
index 00000000..ae6c5c9c
--- /dev/null
+++ b/res/drawable-mdpi/downloading_dark.png
diff --git a/res/drawable-mdpi/downloading_light.png b/res/drawable-mdpi/downloading_light.png
new file mode 100644
index 00000000..abd5b748
--- /dev/null
+++ b/res/drawable-mdpi/downloading_light.png
diff --git a/res/drawable-mdpi/ic_action_volume_dark.png b/res/drawable-mdpi/ic_action_volume_dark.png
new file mode 100644
index 00000000..2b5f1d11
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_volume_dark.png
diff --git a/res/drawable-mdpi/ic_action_volume_light.png b/res/drawable-mdpi/ic_action_volume_light.png
new file mode 100644
index 00000000..47071ccf
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_volume_light.png
diff --git a/res/drawable-mdpi/ic_drawer.png b/res/drawable-mdpi/ic_drawer.png
new file mode 100644
index 00000000..1ed2c56e
--- /dev/null
+++ b/res/drawable-mdpi/ic_drawer.png
diff --git a/res/drawable-mdpi/ic_menu_bookmark_dark.png b/res/drawable-mdpi/ic_menu_bookmark_dark.png
new file mode 100644
index 00000000..3360f37e
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_bookmark_dark.png
diff --git a/res/drawable-mdpi/ic_menu_bookmark_light.png b/res/drawable-mdpi/ic_menu_bookmark_light.png
new file mode 100644
index 00000000..b4d916fb
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_bookmark_light.png
diff --git a/res/drawable-mdpi/ic_menu_chat_dark.png b/res/drawable-mdpi/ic_menu_chat_dark.png
new file mode 100644
index 00000000..74d98888
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_chat_dark.png
diff --git a/res/drawable-mdpi/ic_menu_chat_light.png b/res/drawable-mdpi/ic_menu_chat_light.png
new file mode 100644
index 00000000..468c1220
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_chat_light.png
diff --git a/res/drawable-mdpi/ic_menu_chat_send_dark.png b/res/drawable-mdpi/ic_menu_chat_send_dark.png
new file mode 100644
index 00000000..91db4a4a
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_chat_send_dark.png
diff --git a/res/drawable-mdpi/ic_menu_chat_send_light.png b/res/drawable-mdpi/ic_menu_chat_send_light.png
new file mode 100644
index 00000000..f2a3e724
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_chat_send_light.png
diff --git a/res/drawable-mdpi/ic_menu_library_dark.png b/res/drawable-mdpi/ic_menu_library_dark.png
new file mode 100644
index 00000000..0102d7ad
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_library_dark.png
diff --git a/res/drawable-mdpi/ic_menu_library_light.png b/res/drawable-mdpi/ic_menu_library_light.png
new file mode 100644
index 00000000..a30b4d39
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_library_light.png
diff --git a/res/drawable-mdpi/ic_menu_playlist_dark.png b/res/drawable-mdpi/ic_menu_playlist_dark.png
new file mode 100644
index 00000000..ebf00427
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_playlist_dark.png
diff --git a/res/drawable-mdpi/ic_menu_playlist_light.png b/res/drawable-mdpi/ic_menu_playlist_light.png
new file mode 100644
index 00000000..e248a488
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_playlist_light.png
diff --git a/res/drawable-mdpi/ic_menu_podcast_dark.png b/res/drawable-mdpi/ic_menu_podcast_dark.png
new file mode 100644
index 00000000..ad69156a
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_podcast_dark.png
diff --git a/res/drawable-mdpi/ic_menu_podcast_light.png b/res/drawable-mdpi/ic_menu_podcast_light.png
new file mode 100644
index 00000000..c15cb03f
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_podcast_light.png
diff --git a/res/drawable-mdpi/ic_menu_refresh_dark.png b/res/drawable-mdpi/ic_menu_refresh_dark.png
new file mode 100644
index 00000000..554c07dc
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_refresh_dark.png
diff --git a/res/drawable-mdpi/ic_menu_refresh_light.png b/res/drawable-mdpi/ic_menu_refresh_light.png
new file mode 100644
index 00000000..a2d90c16
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_refresh_light.png
diff --git a/res/drawable-mdpi/ic_menu_remove_dark.png b/res/drawable-mdpi/ic_menu_remove_dark.png
new file mode 100644
index 00000000..5ba24546
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_remove_dark.png
diff --git a/res/drawable-mdpi/ic_menu_remove_light.png b/res/drawable-mdpi/ic_menu_remove_light.png
new file mode 100644
index 00000000..93483b6c
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_remove_light.png
diff --git a/res/drawable-mdpi/ic_menu_save_dark.png b/res/drawable-mdpi/ic_menu_save_dark.png
new file mode 100644
index 00000000..89aa17cc
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_save_dark.png
diff --git a/res/drawable-mdpi/ic_menu_save_light.png b/res/drawable-mdpi/ic_menu_save_light.png
new file mode 100644
index 00000000..dcb3a2f6
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_save_light.png
diff --git a/res/drawable-mdpi/ic_menu_search_dark.png b/res/drawable-mdpi/ic_menu_search_dark.png
new file mode 100644
index 00000000..076085c5
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_search_dark.png
diff --git a/res/drawable-mdpi/ic_menu_search_light.png b/res/drawable-mdpi/ic_menu_search_light.png
new file mode 100644
index 00000000..026c8498
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_search_light.png
diff --git a/res/drawable-mdpi/ic_menu_settings_dark.png b/res/drawable-mdpi/ic_menu_settings_dark.png
new file mode 100644
index 00000000..fc2bf8c3
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_settings_dark.png
diff --git a/res/drawable-mdpi/ic_menu_settings_light.png b/res/drawable-mdpi/ic_menu_settings_light.png
new file mode 100644
index 00000000..0e65c682
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_settings_light.png
diff --git a/res/drawable-mdpi/ic_menu_shuffle_dark.png b/res/drawable-mdpi/ic_menu_shuffle_dark.png
new file mode 100644
index 00000000..7007fde5
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_shuffle_dark.png
diff --git a/res/drawable-mdpi/ic_menu_shuffle_light.png b/res/drawable-mdpi/ic_menu_shuffle_light.png
new file mode 100644
index 00000000..4d07c3b4
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_shuffle_light.png
diff --git a/res/drawable-mdpi/launch.png b/res/drawable-mdpi/launch.png
index c07fc594..22e094eb 100644
--- a/res/drawable-mdpi/launch.png
+++ b/res/drawable-mdpi/launch.png
diff --git a/res/drawable-mdpi/main_offline_dark.png b/res/drawable-mdpi/main_offline_dark.png
new file mode 100644
index 00000000..4990fb8e
--- /dev/null
+++ b/res/drawable-mdpi/main_offline_dark.png
diff --git a/res/drawable-mdpi/main_offline_light.png b/res/drawable-mdpi/main_offline_light.png
new file mode 100644
index 00000000..e70ec1c2
--- /dev/null
+++ b/res/drawable-mdpi/main_offline_light.png
diff --git a/res/drawable-mdpi/main_select_server_dark.png b/res/drawable-mdpi/main_select_server_dark.png
new file mode 100644
index 00000000..119b1573
--- /dev/null
+++ b/res/drawable-mdpi/main_select_server_dark.png
diff --git a/res/drawable-mdpi/main_select_server_light.png b/res/drawable-mdpi/main_select_server_light.png
new file mode 100644
index 00000000..7d8dad34
--- /dev/null
+++ b/res/drawable-mdpi/main_select_server_light.png
diff --git a/res/drawable-mdpi/media_backward_dark.png b/res/drawable-mdpi/media_backward_dark.png
new file mode 100644
index 00000000..4f2233a1
--- /dev/null
+++ b/res/drawable-mdpi/media_backward_dark.png
diff --git a/res/drawable-mdpi/media_backward_light.png b/res/drawable-mdpi/media_backward_light.png
new file mode 100644
index 00000000..425f2df7
--- /dev/null
+++ b/res/drawable-mdpi/media_backward_light.png
diff --git a/res/drawable-mdpi/media_forward_dark.png b/res/drawable-mdpi/media_forward_dark.png
new file mode 100644
index 00000000..1641c0fa
--- /dev/null
+++ b/res/drawable-mdpi/media_forward_dark.png
diff --git a/res/drawable-mdpi/media_forward_light.png b/res/drawable-mdpi/media_forward_light.png
new file mode 100644
index 00000000..2e66868f
--- /dev/null
+++ b/res/drawable-mdpi/media_forward_light.png
diff --git a/res/drawable-mdpi/media_pause_dark.png b/res/drawable-mdpi/media_pause_dark.png
new file mode 100644
index 00000000..3580dab4
--- /dev/null
+++ b/res/drawable-mdpi/media_pause_dark.png
diff --git a/res/drawable-mdpi/media_pause_light.png b/res/drawable-mdpi/media_pause_light.png
new file mode 100644
index 00000000..7e9ade73
--- /dev/null
+++ b/res/drawable-mdpi/media_pause_light.png
diff --git a/res/drawable-mdpi/media_start_dark.png b/res/drawable-mdpi/media_start_dark.png
new file mode 100644
index 00000000..a2f198ae
--- /dev/null
+++ b/res/drawable-mdpi/media_start_dark.png
diff --git a/res/drawable-mdpi/media_start_light.png b/res/drawable-mdpi/media_start_light.png
new file mode 100644
index 00000000..d69107ba
--- /dev/null
+++ b/res/drawable-mdpi/media_start_light.png
diff --git a/res/drawable-mdpi/media_stop_dark.png b/res/drawable-mdpi/media_stop_dark.png
new file mode 100644
index 00000000..944482e6
--- /dev/null
+++ b/res/drawable-mdpi/media_stop_dark.png
diff --git a/res/drawable-mdpi/media_stop_light.png b/res/drawable-mdpi/media_stop_light.png
new file mode 100644
index 00000000..ff1932a1
--- /dev/null
+++ b/res/drawable-mdpi/media_stop_light.png
diff --git a/res/drawable-mdpi/notification_close.png b/res/drawable-mdpi/notification_close.png
new file mode 100644
index 00000000..2a8f9a36
--- /dev/null
+++ b/res/drawable-mdpi/notification_close.png
diff --git a/res/drawable-mdpi/notification_next.png b/res/drawable-mdpi/notification_next.png
new file mode 100644
index 00000000..f85d45a5
--- /dev/null
+++ b/res/drawable-mdpi/notification_next.png
diff --git a/res/drawable-mdpi/notification_pause.png b/res/drawable-mdpi/notification_pause.png
new file mode 100644
index 00000000..06c3cf9d
--- /dev/null
+++ b/res/drawable-mdpi/notification_pause.png
diff --git a/res/drawable-mdpi/notification_play.png b/res/drawable-mdpi/notification_play.png
new file mode 100644
index 00000000..0248c1cc
--- /dev/null
+++ b/res/drawable-mdpi/notification_play.png
diff --git a/res/drawable-mdpi/notification_previous.png b/res/drawable-mdpi/notification_previous.png
new file mode 100644
index 00000000..167d7d05
--- /dev/null
+++ b/res/drawable-mdpi/notification_previous.png
diff --git a/res/drawable-mdpi/now_playing.png b/res/drawable-mdpi/now_playing.png
new file mode 100644
index 00000000..0248c1cc
--- /dev/null
+++ b/res/drawable-mdpi/now_playing.png
diff --git a/res/drawable-mdpi/stat_notify_download.png b/res/drawable-mdpi/stat_notify_download.png
new file mode 100644
index 00000000..4c2a22de
--- /dev/null
+++ b/res/drawable-mdpi/stat_notify_download.png
diff --git a/res/drawable-mdpi/stat_notify_playing.png b/res/drawable-mdpi/stat_notify_playing.png
new file mode 100644
index 00000000..0248c1cc
--- /dev/null
+++ b/res/drawable-mdpi/stat_notify_playing.png
diff --git a/res/drawable-xhdpi-v11/notification_close.png b/res/drawable-xhdpi-v11/notification_close.png
new file mode 100644
index 00000000..f1013578
--- /dev/null
+++ b/res/drawable-xhdpi-v11/notification_close.png
diff --git a/res/drawable-xhdpi-v11/notification_next.png b/res/drawable-xhdpi-v11/notification_next.png
new file mode 100644
index 00000000..ad070680
--- /dev/null
+++ b/res/drawable-xhdpi-v11/notification_next.png
diff --git a/res/drawable-xhdpi-v11/notification_pause.png b/res/drawable-xhdpi-v11/notification_pause.png
new file mode 100644
index 00000000..709602aa
--- /dev/null
+++ b/res/drawable-xhdpi-v11/notification_pause.png
diff --git a/res/drawable-xhdpi-v11/notification_play.png b/res/drawable-xhdpi-v11/notification_play.png
new file mode 100644
index 00000000..e2bafa6a
--- /dev/null
+++ b/res/drawable-xhdpi-v11/notification_play.png
diff --git a/res/drawable-xhdpi-v11/notification_previous.png b/res/drawable-xhdpi-v11/notification_previous.png
new file mode 100644
index 00000000..d22488cb
--- /dev/null
+++ b/res/drawable-xhdpi-v11/notification_previous.png
diff --git a/res/drawable-xhdpi-v11/stat_notify_download.png b/res/drawable-xhdpi-v11/stat_notify_download.png
new file mode 100644
index 00000000..96ceb383
--- /dev/null
+++ b/res/drawable-xhdpi-v11/stat_notify_download.png
diff --git a/res/drawable-xhdpi-v11/stat_notify_playing.png b/res/drawable-xhdpi-v11/stat_notify_playing.png
new file mode 100644
index 00000000..e2bafa6a
--- /dev/null
+++ b/res/drawable-xhdpi-v11/stat_notify_playing.png
diff --git a/res/drawable-xhdpi/action_toggle_list_dark.png b/res/drawable-xhdpi/action_toggle_list_dark.png
new file mode 100644
index 00000000..92003c6b
--- /dev/null
+++ b/res/drawable-xhdpi/action_toggle_list_dark.png
diff --git a/res/drawable-xhdpi/action_toggle_list_light.png b/res/drawable-xhdpi/action_toggle_list_light.png
new file mode 100644
index 00000000..a4007ea5
--- /dev/null
+++ b/res/drawable-xhdpi/action_toggle_list_light.png
diff --git a/res/drawable-xhdpi/download_cached.png b/res/drawable-xhdpi/download_cached.png
new file mode 100644
index 00000000..1ef7c805
--- /dev/null
+++ b/res/drawable-xhdpi/download_cached.png
diff --git a/res/drawable-xhdpi/download_none_dark.png b/res/drawable-xhdpi/download_none_dark.png
new file mode 100644
index 00000000..7be3c2a4
--- /dev/null
+++ b/res/drawable-xhdpi/download_none_dark.png
diff --git a/res/drawable-xhdpi/download_none_light.png b/res/drawable-xhdpi/download_none_light.png
new file mode 100644
index 00000000..817651d7
--- /dev/null
+++ b/res/drawable-xhdpi/download_none_light.png
diff --git a/res/drawable-xhdpi/download_pinned.png b/res/drawable-xhdpi/download_pinned.png
new file mode 100644
index 00000000..09eb6ffb
--- /dev/null
+++ b/res/drawable-xhdpi/download_pinned.png
diff --git a/res/drawable-xhdpi/downloading_dark.png b/res/drawable-xhdpi/downloading_dark.png
new file mode 100644
index 00000000..3f14bdf4
--- /dev/null
+++ b/res/drawable-xhdpi/downloading_dark.png
diff --git a/res/drawable-xhdpi/downloading_light.png b/res/drawable-xhdpi/downloading_light.png
new file mode 100644
index 00000000..643c15d0
--- /dev/null
+++ b/res/drawable-xhdpi/downloading_light.png
diff --git a/res/drawable-xhdpi/ic_action_volume_dark.png b/res/drawable-xhdpi/ic_action_volume_dark.png
new file mode 100644
index 00000000..400de38b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_volume_dark.png
diff --git a/res/drawable-xhdpi/ic_action_volume_light.png b/res/drawable-xhdpi/ic_action_volume_light.png
new file mode 100644
index 00000000..9a1128c1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_volume_light.png
diff --git a/res/drawable-xhdpi/ic_drawer.png b/res/drawable-xhdpi/ic_drawer.png
new file mode 100644
index 00000000..a5fa74de
--- /dev/null
+++ b/res/drawable-xhdpi/ic_drawer.png
diff --git a/res/drawable-xhdpi/ic_menu_bookmark_dark.png b/res/drawable-xhdpi/ic_menu_bookmark_dark.png
new file mode 100644
index 00000000..18f71365
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_bookmark_dark.png
diff --git a/res/drawable-xhdpi/ic_menu_bookmark_light.png b/res/drawable-xhdpi/ic_menu_bookmark_light.png
new file mode 100644
index 00000000..d5776317
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_bookmark_light.png
diff --git a/res/drawable-xhdpi/ic_menu_chat_dark.png b/res/drawable-xhdpi/ic_menu_chat_dark.png
new file mode 100644
index 00000000..28318219
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_chat_dark.png
diff --git a/res/drawable-xhdpi/ic_menu_chat_light.png b/res/drawable-xhdpi/ic_menu_chat_light.png
new file mode 100644
index 00000000..dcc95dcb
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_chat_light.png
diff --git a/res/drawable-xhdpi/ic_menu_chat_send_dark.png b/res/drawable-xhdpi/ic_menu_chat_send_dark.png
new file mode 100644
index 00000000..c0a5a3eb
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_chat_send_dark.png
diff --git a/res/drawable-xhdpi/ic_menu_chat_send_light.png b/res/drawable-xhdpi/ic_menu_chat_send_light.png
new file mode 100644
index 00000000..f9c3b9bb
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_chat_send_light.png
diff --git a/res/drawable-xhdpi/ic_menu_library_dark.png b/res/drawable-xhdpi/ic_menu_library_dark.png
new file mode 100644
index 00000000..b1612f65
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_library_dark.png
diff --git a/res/drawable-xhdpi/ic_menu_library_light.png b/res/drawable-xhdpi/ic_menu_library_light.png
new file mode 100644
index 00000000..1f93c8f2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_library_light.png
diff --git a/res/drawable-xhdpi/ic_menu_playlist_dark.png b/res/drawable-xhdpi/ic_menu_playlist_dark.png
new file mode 100644
index 00000000..fd6cd498
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_playlist_dark.png
diff --git a/res/drawable-xhdpi/ic_menu_playlist_light.png b/res/drawable-xhdpi/ic_menu_playlist_light.png
new file mode 100644
index 00000000..e7e510d0
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_playlist_light.png
diff --git a/res/drawable-xhdpi/ic_menu_podcast_dark.png b/res/drawable-xhdpi/ic_menu_podcast_dark.png
new file mode 100644
index 00000000..40469b46
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_podcast_dark.png
diff --git a/res/drawable-xhdpi/ic_menu_podcast_light.png b/res/drawable-xhdpi/ic_menu_podcast_light.png
new file mode 100644
index 00000000..3748526a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_podcast_light.png
diff --git a/res/drawable-xhdpi/ic_menu_refresh_dark.png b/res/drawable-xhdpi/ic_menu_refresh_dark.png
new file mode 100644
index 00000000..b6801006
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_refresh_dark.png
diff --git a/res/drawable-xhdpi/ic_menu_refresh_light.png b/res/drawable-xhdpi/ic_menu_refresh_light.png
new file mode 100644
index 00000000..38943f82
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_refresh_light.png
diff --git a/res/drawable-xhdpi/ic_menu_remove_dark.png b/res/drawable-xhdpi/ic_menu_remove_dark.png
new file mode 100644
index 00000000..09ce75e2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_remove_dark.png
diff --git a/res/drawable-xhdpi/ic_menu_remove_light.png b/res/drawable-xhdpi/ic_menu_remove_light.png
new file mode 100644
index 00000000..94f7c8c1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_remove_light.png
diff --git a/res/drawable-xhdpi/ic_menu_save_dark.png b/res/drawable-xhdpi/ic_menu_save_dark.png
new file mode 100644
index 00000000..1612fd0a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_save_dark.png
diff --git a/res/drawable-xhdpi/ic_menu_save_light.png b/res/drawable-xhdpi/ic_menu_save_light.png
new file mode 100644
index 00000000..5dcd75d7
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_save_light.png
diff --git a/res/drawable-xhdpi/ic_menu_search_dark.png b/res/drawable-xhdpi/ic_menu_search_dark.png
new file mode 100644
index 00000000..1ae3dff0
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_search_dark.png
diff --git a/res/drawable-xhdpi/ic_menu_search_light.png b/res/drawable-xhdpi/ic_menu_search_light.png
new file mode 100644
index 00000000..705074bd
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_search_light.png
diff --git a/res/drawable-xhdpi/ic_menu_settings_dark.png b/res/drawable-xhdpi/ic_menu_settings_dark.png
new file mode 100644
index 00000000..ae917587
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_settings_dark.png
diff --git a/res/drawable-xhdpi/ic_menu_settings_light.png b/res/drawable-xhdpi/ic_menu_settings_light.png
new file mode 100644
index 00000000..29f961b2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_settings_light.png
diff --git a/res/drawable-xhdpi/ic_menu_shuffle_dark.png b/res/drawable-xhdpi/ic_menu_shuffle_dark.png
new file mode 100644
index 00000000..e3a31a84
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_shuffle_dark.png
diff --git a/res/drawable-xhdpi/ic_menu_shuffle_light.png b/res/drawable-xhdpi/ic_menu_shuffle_light.png
new file mode 100644
index 00000000..14eb942c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_shuffle_light.png
diff --git a/res/drawable-xhdpi/launch.png b/res/drawable-xhdpi/launch.png
index b9379f27..f73729d0 100644
--- a/res/drawable-xhdpi/launch.png
+++ b/res/drawable-xhdpi/launch.png
diff --git a/res/drawable-xhdpi/main_offline_dark.png b/res/drawable-xhdpi/main_offline_dark.png
new file mode 100644
index 00000000..231e4715
--- /dev/null
+++ b/res/drawable-xhdpi/main_offline_dark.png
diff --git a/res/drawable-xhdpi/main_offline_light.png b/res/drawable-xhdpi/main_offline_light.png
new file mode 100644
index 00000000..87937fcb
--- /dev/null
+++ b/res/drawable-xhdpi/main_offline_light.png
diff --git a/res/drawable-xhdpi/main_select_server_dark.png b/res/drawable-xhdpi/main_select_server_dark.png
new file mode 100644
index 00000000..b84f1851
--- /dev/null
+++ b/res/drawable-xhdpi/main_select_server_dark.png
diff --git a/res/drawable-xhdpi/main_select_server_light.png b/res/drawable-xhdpi/main_select_server_light.png
new file mode 100644
index 00000000..ee154cc7
--- /dev/null
+++ b/res/drawable-xhdpi/main_select_server_light.png
diff --git a/res/drawable-xhdpi/media_backward_dark.png b/res/drawable-xhdpi/media_backward_dark.png
new file mode 100644
index 00000000..3c9921a8
--- /dev/null
+++ b/res/drawable-xhdpi/media_backward_dark.png
diff --git a/res/drawable-xhdpi/media_backward_light.png b/res/drawable-xhdpi/media_backward_light.png
new file mode 100644
index 00000000..aafd76fa
--- /dev/null
+++ b/res/drawable-xhdpi/media_backward_light.png
diff --git a/res/drawable-xhdpi/media_forward_dark.png b/res/drawable-xhdpi/media_forward_dark.png
new file mode 100644
index 00000000..b082b3a6
--- /dev/null
+++ b/res/drawable-xhdpi/media_forward_dark.png
diff --git a/res/drawable-xhdpi/media_forward_light.png b/res/drawable-xhdpi/media_forward_light.png
new file mode 100644
index 00000000..20772843
--- /dev/null
+++ b/res/drawable-xhdpi/media_forward_light.png
diff --git a/res/drawable-xhdpi/media_pause_dark.png b/res/drawable-xhdpi/media_pause_dark.png
new file mode 100644
index 00000000..aafdd4aa
--- /dev/null
+++ b/res/drawable-xhdpi/media_pause_dark.png
diff --git a/res/drawable-xhdpi/media_pause_light.png b/res/drawable-xhdpi/media_pause_light.png
new file mode 100644
index 00000000..2639777d
--- /dev/null
+++ b/res/drawable-xhdpi/media_pause_light.png
diff --git a/res/drawable-xhdpi/media_start_dark.png b/res/drawable-xhdpi/media_start_dark.png
new file mode 100644
index 00000000..9e63c90b
--- /dev/null
+++ b/res/drawable-xhdpi/media_start_dark.png
diff --git a/res/drawable-xhdpi/media_start_light.png b/res/drawable-xhdpi/media_start_light.png
new file mode 100644
index 00000000..2ff8c399
--- /dev/null
+++ b/res/drawable-xhdpi/media_start_light.png
diff --git a/res/drawable-xhdpi/media_stop_dark.png b/res/drawable-xhdpi/media_stop_dark.png
new file mode 100644
index 00000000..9cb32909
--- /dev/null
+++ b/res/drawable-xhdpi/media_stop_dark.png
diff --git a/res/drawable-xhdpi/media_stop_light.png b/res/drawable-xhdpi/media_stop_light.png
new file mode 100644
index 00000000..edf13ccf
--- /dev/null
+++ b/res/drawable-xhdpi/media_stop_light.png
diff --git a/res/drawable-xhdpi/notification_close.png b/res/drawable-xhdpi/notification_close.png
new file mode 100644
index 00000000..4230842e
--- /dev/null
+++ b/res/drawable-xhdpi/notification_close.png
diff --git a/res/drawable-xhdpi/notification_next.png b/res/drawable-xhdpi/notification_next.png
new file mode 100644
index 00000000..44dbbd12
--- /dev/null
+++ b/res/drawable-xhdpi/notification_next.png
diff --git a/res/drawable-xhdpi/notification_pause.png b/res/drawable-xhdpi/notification_pause.png
new file mode 100644
index 00000000..e8d8c535
--- /dev/null
+++ b/res/drawable-xhdpi/notification_pause.png
diff --git a/res/drawable-xhdpi/notification_play.png b/res/drawable-xhdpi/notification_play.png
new file mode 100644
index 00000000..532041fa
--- /dev/null
+++ b/res/drawable-xhdpi/notification_play.png
diff --git a/res/drawable-xhdpi/notification_previous.png b/res/drawable-xhdpi/notification_previous.png
new file mode 100644
index 00000000..87ee8d2f
--- /dev/null
+++ b/res/drawable-xhdpi/notification_previous.png
diff --git a/res/drawable-xhdpi/now_playing.png b/res/drawable-xhdpi/now_playing.png
new file mode 100644
index 00000000..532041fa
--- /dev/null
+++ b/res/drawable-xhdpi/now_playing.png
diff --git a/res/drawable-xhdpi/stat_notify_download.png b/res/drawable-xhdpi/stat_notify_download.png
new file mode 100644
index 00000000..bd4cb567
--- /dev/null
+++ b/res/drawable-xhdpi/stat_notify_download.png
diff --git a/res/drawable-xhdpi/stat_notify_playing.png b/res/drawable-xhdpi/stat_notify_playing.png
new file mode 100644
index 00000000..532041fa
--- /dev/null
+++ b/res/drawable-xhdpi/stat_notify_playing.png
diff --git a/res/drawable-xxhdpi-v11/notification_close.png b/res/drawable-xxhdpi-v11/notification_close.png
new file mode 100644
index 00000000..c3ac026a
--- /dev/null
+++ b/res/drawable-xxhdpi-v11/notification_close.png
diff --git a/res/drawable-xxhdpi-v11/notification_next.png b/res/drawable-xxhdpi-v11/notification_next.png
new file mode 100644
index 00000000..06911082
--- /dev/null
+++ b/res/drawable-xxhdpi-v11/notification_next.png
diff --git a/res/drawable-xxhdpi-v11/notification_pause.png b/res/drawable-xxhdpi-v11/notification_pause.png
new file mode 100644
index 00000000..1513f9d9
--- /dev/null
+++ b/res/drawable-xxhdpi-v11/notification_pause.png
diff --git a/res/drawable-xxhdpi-v11/notification_play.png b/res/drawable-xxhdpi-v11/notification_play.png
new file mode 100644
index 00000000..9138a760
--- /dev/null
+++ b/res/drawable-xxhdpi-v11/notification_play.png
diff --git a/res/drawable-xxhdpi-v11/notification_previous.png b/res/drawable-xxhdpi-v11/notification_previous.png
new file mode 100644
index 00000000..b4456c16
--- /dev/null
+++ b/res/drawable-xxhdpi-v11/notification_previous.png
diff --git a/res/drawable-xxhdpi-v11/stat_notify_download.png b/res/drawable-xxhdpi-v11/stat_notify_download.png
new file mode 100644
index 00000000..b2dc5651
--- /dev/null
+++ b/res/drawable-xxhdpi-v11/stat_notify_download.png
diff --git a/res/drawable-xxhdpi-v11/stat_notify_playing.png b/res/drawable-xxhdpi-v11/stat_notify_playing.png
new file mode 100644
index 00000000..9138a760
--- /dev/null
+++ b/res/drawable-xxhdpi-v11/stat_notify_playing.png
diff --git a/res/drawable-xxhdpi/action_toggle_list_dark.png b/res/drawable-xxhdpi/action_toggle_list_dark.png
new file mode 100644
index 00000000..598fc312
--- /dev/null
+++ b/res/drawable-xxhdpi/action_toggle_list_dark.png
diff --git a/res/drawable-xxhdpi/action_toggle_list_light.png b/res/drawable-xxhdpi/action_toggle_list_light.png
new file mode 100644
index 00000000..ceb3fade
--- /dev/null
+++ b/res/drawable-xxhdpi/action_toggle_list_light.png
diff --git a/res/drawable-xxhdpi/download_none_dark.png b/res/drawable-xxhdpi/download_none_dark.png
new file mode 100644
index 00000000..a0cb8a41
--- /dev/null
+++ b/res/drawable-xxhdpi/download_none_dark.png
diff --git a/res/drawable-xxhdpi/download_none_light.png b/res/drawable-xxhdpi/download_none_light.png
new file mode 100644
index 00000000..7a1639ef
--- /dev/null
+++ b/res/drawable-xxhdpi/download_none_light.png
diff --git a/res/drawable-xxhdpi/downloading_dark.png b/res/drawable-xxhdpi/downloading_dark.png
new file mode 100644
index 00000000..afc4bf84
--- /dev/null
+++ b/res/drawable-xxhdpi/downloading_dark.png
diff --git a/res/drawable-xxhdpi/downloading_light.png b/res/drawable-xxhdpi/downloading_light.png
new file mode 100644
index 00000000..ba31a979
--- /dev/null
+++ b/res/drawable-xxhdpi/downloading_light.png
diff --git a/res/drawable-xxhdpi/ic_action_volume_dark.png b/res/drawable-xxhdpi/ic_action_volume_dark.png
new file mode 100644
index 00000000..7991a65d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_volume_dark.png
diff --git a/res/drawable-xxhdpi/ic_action_volume_light.png b/res/drawable-xxhdpi/ic_action_volume_light.png
new file mode 100644
index 00000000..8dfbf3f5
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_volume_light.png
diff --git a/res/drawable-xxhdpi/ic_drawer.png b/res/drawable-xxhdpi/ic_drawer.png
new file mode 100644
index 00000000..9c4685d6
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_drawer.png
diff --git a/res/drawable-xxhdpi/ic_menu_bookmark_dark.png b/res/drawable-xxhdpi/ic_menu_bookmark_dark.png
new file mode 100644
index 00000000..2523e14c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_bookmark_dark.png
diff --git a/res/drawable-xxhdpi/ic_menu_bookmark_light.png b/res/drawable-xxhdpi/ic_menu_bookmark_light.png
new file mode 100644
index 00000000..9e8c4591
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_bookmark_light.png
diff --git a/res/drawable-xxhdpi/ic_menu_chat_dark.png b/res/drawable-xxhdpi/ic_menu_chat_dark.png
new file mode 100644
index 00000000..60efb47d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_chat_dark.png
diff --git a/res/drawable-xxhdpi/ic_menu_chat_light.png b/res/drawable-xxhdpi/ic_menu_chat_light.png
new file mode 100644
index 00000000..02c89560
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_chat_light.png
diff --git a/res/drawable-xxhdpi/ic_menu_chat_send_dark.png b/res/drawable-xxhdpi/ic_menu_chat_send_dark.png
new file mode 100644
index 00000000..b86ca3d3
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_chat_send_dark.png
diff --git a/res/drawable-xxhdpi/ic_menu_chat_send_light.png b/res/drawable-xxhdpi/ic_menu_chat_send_light.png
new file mode 100644
index 00000000..048b8aac
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_chat_send_light.png
diff --git a/res/drawable-xxhdpi/ic_menu_library_dark.png b/res/drawable-xxhdpi/ic_menu_library_dark.png
new file mode 100644
index 00000000..02a4f3f2
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_library_dark.png
diff --git a/res/drawable-xxhdpi/ic_menu_library_light.png b/res/drawable-xxhdpi/ic_menu_library_light.png
new file mode 100644
index 00000000..52ce8203
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_library_light.png
diff --git a/res/drawable-xxhdpi/ic_menu_playlist_dark.png b/res/drawable-xxhdpi/ic_menu_playlist_dark.png
new file mode 100644
index 00000000..2c955eee
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_playlist_dark.png
diff --git a/res/drawable-xxhdpi/ic_menu_playlist_light.png b/res/drawable-xxhdpi/ic_menu_playlist_light.png
new file mode 100644
index 00000000..d1877328
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_playlist_light.png
diff --git a/res/drawable-xxhdpi/ic_menu_podcast_dark.png b/res/drawable-xxhdpi/ic_menu_podcast_dark.png
new file mode 100644
index 00000000..a748dc60
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_podcast_dark.png
diff --git a/res/drawable-xxhdpi/ic_menu_podcast_light.png b/res/drawable-xxhdpi/ic_menu_podcast_light.png
new file mode 100644
index 00000000..efa7b037
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_podcast_light.png
diff --git a/res/drawable-xxhdpi/ic_menu_refresh_dark.png b/res/drawable-xxhdpi/ic_menu_refresh_dark.png
new file mode 100644
index 00000000..0e5616bd
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_refresh_dark.png
diff --git a/res/drawable-xxhdpi/ic_menu_refresh_light.png b/res/drawable-xxhdpi/ic_menu_refresh_light.png
new file mode 100644
index 00000000..7dea70df
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_refresh_light.png
diff --git a/res/drawable-xxhdpi/ic_menu_remove_dark.png b/res/drawable-xxhdpi/ic_menu_remove_dark.png
new file mode 100644
index 00000000..d5952ea0
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_remove_dark.png
diff --git a/res/drawable-xxhdpi/ic_menu_remove_light.png b/res/drawable-xxhdpi/ic_menu_remove_light.png
new file mode 100644
index 00000000..c814869e
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_remove_light.png
diff --git a/res/drawable-xxhdpi/ic_menu_save_dark.png b/res/drawable-xxhdpi/ic_menu_save_dark.png
new file mode 100644
index 00000000..acb264ec
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_save_dark.png
diff --git a/res/drawable-xxhdpi/ic_menu_save_light.png b/res/drawable-xxhdpi/ic_menu_save_light.png
new file mode 100644
index 00000000..fcd18ccd
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_save_light.png
diff --git a/res/drawable-xxhdpi/ic_menu_search_dark.png b/res/drawable-xxhdpi/ic_menu_search_dark.png
new file mode 100644
index 00000000..500ac03a
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_search_dark.png
diff --git a/res/drawable-xxhdpi/ic_menu_search_light.png b/res/drawable-xxhdpi/ic_menu_search_light.png
new file mode 100644
index 00000000..fa64f9e8
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_search_light.png
diff --git a/res/drawable-xxhdpi/ic_menu_settings_dark.png b/res/drawable-xxhdpi/ic_menu_settings_dark.png
new file mode 100644
index 00000000..ded5dbb5
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_settings_dark.png
diff --git a/res/drawable-xxhdpi/ic_menu_settings_light.png b/res/drawable-xxhdpi/ic_menu_settings_light.png
new file mode 100644
index 00000000..cd242306
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_settings_light.png
diff --git a/res/drawable-xxhdpi/ic_menu_shuffle_dark.png b/res/drawable-xxhdpi/ic_menu_shuffle_dark.png
new file mode 100644
index 00000000..b53733df
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_shuffle_dark.png
diff --git a/res/drawable-xxhdpi/ic_menu_shuffle_light.png b/res/drawable-xxhdpi/ic_menu_shuffle_light.png
new file mode 100644
index 00000000..4d5dff32
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_shuffle_light.png
diff --git a/res/drawable-xxhdpi/launch.png b/res/drawable-xxhdpi/launch.png
index 797104fe..b067bd9f 100644
--- a/res/drawable-xxhdpi/launch.png
+++ b/res/drawable-xxhdpi/launch.png
diff --git a/res/drawable-xxhdpi/main_offline_dark.png b/res/drawable-xxhdpi/main_offline_dark.png
new file mode 100644
index 00000000..c415e0a5
--- /dev/null
+++ b/res/drawable-xxhdpi/main_offline_dark.png
diff --git a/res/drawable-xxhdpi/main_offline_light.png b/res/drawable-xxhdpi/main_offline_light.png
new file mode 100644
index 00000000..b7e1c380
--- /dev/null
+++ b/res/drawable-xxhdpi/main_offline_light.png
diff --git a/res/drawable-xxhdpi/main_select_server_dark.png b/res/drawable-xxhdpi/main_select_server_dark.png
new file mode 100644
index 00000000..b85e3a1e
--- /dev/null
+++ b/res/drawable-xxhdpi/main_select_server_dark.png
diff --git a/res/drawable-xxhdpi/main_select_server_light.png b/res/drawable-xxhdpi/main_select_server_light.png
new file mode 100644
index 00000000..8fc39eff
--- /dev/null
+++ b/res/drawable-xxhdpi/main_select_server_light.png
diff --git a/res/drawable-xxhdpi/media_backward_dark.png b/res/drawable-xxhdpi/media_backward_dark.png
new file mode 100644
index 00000000..5b6c6148
--- /dev/null
+++ b/res/drawable-xxhdpi/media_backward_dark.png
diff --git a/res/drawable-xxhdpi/media_backward_light.png b/res/drawable-xxhdpi/media_backward_light.png
new file mode 100644
index 00000000..32f7d3bc
--- /dev/null
+++ b/res/drawable-xxhdpi/media_backward_light.png
diff --git a/res/drawable-xxhdpi/media_forward_dark.png b/res/drawable-xxhdpi/media_forward_dark.png
new file mode 100644
index 00000000..ca4ee295
--- /dev/null
+++ b/res/drawable-xxhdpi/media_forward_dark.png
diff --git a/res/drawable-xxhdpi/media_forward_light.png b/res/drawable-xxhdpi/media_forward_light.png
new file mode 100644
index 00000000..208e46e9
--- /dev/null
+++ b/res/drawable-xxhdpi/media_forward_light.png
diff --git a/res/drawable-xxhdpi/media_pause_dark.png b/res/drawable-xxhdpi/media_pause_dark.png
new file mode 100644
index 00000000..4b5aacbc
--- /dev/null
+++ b/res/drawable-xxhdpi/media_pause_dark.png
diff --git a/res/drawable-xxhdpi/media_pause_light.png b/res/drawable-xxhdpi/media_pause_light.png
new file mode 100644
index 00000000..111f6d00
--- /dev/null
+++ b/res/drawable-xxhdpi/media_pause_light.png
diff --git a/res/drawable-xxhdpi/media_start_dark.png b/res/drawable-xxhdpi/media_start_dark.png
new file mode 100644
index 00000000..641ad544
--- /dev/null
+++ b/res/drawable-xxhdpi/media_start_dark.png
diff --git a/res/drawable-xxhdpi/media_start_light.png b/res/drawable-xxhdpi/media_start_light.png
new file mode 100644
index 00000000..a6286203
--- /dev/null
+++ b/res/drawable-xxhdpi/media_start_light.png
diff --git a/res/drawable-xxhdpi/media_stop_dark.png b/res/drawable-xxhdpi/media_stop_dark.png
new file mode 100644
index 00000000..9a9c432a
--- /dev/null
+++ b/res/drawable-xxhdpi/media_stop_dark.png
diff --git a/res/drawable-xxhdpi/media_stop_light.png b/res/drawable-xxhdpi/media_stop_light.png
new file mode 100644
index 00000000..79eb8d95
--- /dev/null
+++ b/res/drawable-xxhdpi/media_stop_light.png
diff --git a/res/drawable-xxhdpi/notification_close.png b/res/drawable-xxhdpi/notification_close.png
new file mode 100644
index 00000000..022a6780
--- /dev/null
+++ b/res/drawable-xxhdpi/notification_close.png
diff --git a/res/drawable-xxhdpi/notification_next.png b/res/drawable-xxhdpi/notification_next.png
new file mode 100644
index 00000000..dfe129db
--- /dev/null
+++ b/res/drawable-xxhdpi/notification_next.png
diff --git a/res/drawable-xxhdpi/notification_pause.png b/res/drawable-xxhdpi/notification_pause.png
new file mode 100644
index 00000000..9c952207
--- /dev/null
+++ b/res/drawable-xxhdpi/notification_pause.png
diff --git a/res/drawable-xxhdpi/notification_play.png b/res/drawable-xxhdpi/notification_play.png
new file mode 100644
index 00000000..4ee0a5eb
--- /dev/null
+++ b/res/drawable-xxhdpi/notification_play.png
diff --git a/res/drawable-xxhdpi/notification_previous.png b/res/drawable-xxhdpi/notification_previous.png
new file mode 100644
index 00000000..e6908126
--- /dev/null
+++ b/res/drawable-xxhdpi/notification_previous.png
diff --git a/res/drawable-xxhdpi/now_playing.png b/res/drawable-xxhdpi/now_playing.png
new file mode 100644
index 00000000..4ee0a5eb
--- /dev/null
+++ b/res/drawable-xxhdpi/now_playing.png
diff --git a/res/drawable-xxhdpi/stat_notify_download.png b/res/drawable-xxhdpi/stat_notify_download.png
new file mode 100644
index 00000000..9d9a7f3e
--- /dev/null
+++ b/res/drawable-xxhdpi/stat_notify_download.png
diff --git a/res/drawable-xxhdpi/stat_notify_playing.png b/res/drawable-xxhdpi/stat_notify_playing.png
new file mode 100644
index 00000000..4ee0a5eb
--- /dev/null
+++ b/res/drawable-xxhdpi/stat_notify_playing.png
diff --git a/res/layout-land/download.xml b/res/layout-land/download.xml
index 5b4db35e..b896509e 100644
--- a/res/layout-land/download.xml
+++ b/res/layout-land/download.xml
@@ -40,55 +40,11 @@
 				android:layout_weight="1"

 				android:background="@android:color/transparent">

 

-				<LinearLayout

-						android:id="@+id/download_other_controls_layout"

-						android:orientation="horizontal"

-						android:layout_width="wrap_content"

-						android:layout_height="wrap_content"

-						android:layout_gravity="center_horizontal">

-

-					<Button

-						android:id="@+id/download_jukebox"

-						android:text="RC"

-						android:textStyle="bold"

-						android:textSize="22sp"

-						android:background="@drawable/menubar_button"

-						android:layout_width="wrap_content"

-						android:layout_height="wrap_content"

-						android:layout_marginTop="3dip"

-						android:padding="9dip"/>

-					<Button

-						android:id="@+id/download_equalizer"

-						android:text="EQ"

-						android:textStyle="bold"

-						android:textSize="22sp"

-						android:background="@drawable/menubar_button"

-						android:layout_width="wrap_content"

-						android:layout_height="wrap_content"

-						android:layout_marginTop="3dip"

-						android:padding="9dip"/>

-					<Button

-						android:id="@+id/download_visualizer"

-						android:text="VIS"

-						android:textStyle="bold"

-						android:textSize="22sp"

-						android:background="@drawable/menubar_button"

-						android:layout_width="wrap_content"

-						android:layout_height="wrap_content"

-						android:layout_marginTop="3dip"

-						android:padding="9dip"/>

-					<ImageButton

-						android:id="@+id/download_star"

-						android:layout_width="wrap_content"

-						android:layout_height="wrap_content"

-						android:layout_gravity="center_vertical"

-						android:background="@drawable/menubar_button"

-						android:src="@android:drawable/star_big_off"

-						android:padding="10dip"/>

-				</LinearLayout>

+				<include layout="@layout/download_action_buttons"/>

 

 				<LinearLayout

 						android:id="@+id/download_visualizer_view_layout"

+						android:orientation="horizontal"

 						android:layout_width="fill_parent"

 						android:layout_height="60dip"

 						android:layout_marginLeft="12dip"

diff --git a/res/layout-large-land/abstract_fragment_container.xml b/res/layout-large-land/abstract_fragment_container.xml
new file mode 100644
index 00000000..511d63aa
--- /dev/null
+++ b/res/layout-large-land/abstract_fragment_container.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>

+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

+	android:orientation="horizontal"

+	android:layout_width="match_parent"

+	android:layout_height="0px"

+	android:layout_weight="1">

+

+	<FrameLayout

+		android:id="@+id/fragment_container"

+		android:layout_width="0px"

+		android:layout_height="match_parent"

+		android:layout_weight="4"/>

+

+	<FrameLayout

+		android:id="@+id/fragment_second_container"

+		android:layout_width="0px"

+		android:layout_height="match_parent"

+		android:layout_weight="6"

+		android:visibility="gone"/>

+

+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-port/download.xml b/res/layout-port/download.xml
index 4b39286a..38ab069f 100644
--- a/res/layout-port/download.xml
+++ b/res/layout-port/download.xml
@@ -25,9 +25,8 @@
 					android:background="@android:color/transparent">

 

 				<RelativeLayout android:orientation="vertical"

-					android:layout_width="fill_parent"

-					android:layout_height="fill_parent"

-					android:layout_weight="1"

+					android:layout_width="wrap_content"

+					android:layout_height="wrap_content"

 					android:layout_above="@+id/download_song_title">

 

 					<ImageView

@@ -38,70 +37,25 @@
 						android:layout_alignParentTop="true"

 						android:scaleType="centerCrop"/>

 

-					<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

+					<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

 						android:id="@+id/download_overlay_buttons"

-						android:orientation="horizontal"

 						android:layout_width="fill_parent"

 						android:layout_height="wrap_content"

 						android:background="@color/overlayColor"

 						android:layout_alignParentBottom="true">

 

-						<Button

-							android:id="@+id/download_jukebox"

-							android:text="RC"

-							android:textStyle="bold"

-							android:textSize="22sp"

-							android:background="@drawable/menubar_button"

-							android:layout_width="wrap_content"

-							android:layout_height="wrap_content"

-							android:layout_gravity="bottom"

-							android:paddingTop="4dip"

-							android:paddingLeft="14dip"

-							android:paddingBottom="4dip"/>

-

-						<Button

-							android:id="@+id/download_equalizer"

-							android:text="EQ"

-							android:textStyle="bold"

-							android:textSize="22sp"

-							android:background="@drawable/menubar_button"

+						<LinearLayout

 							android:layout_width="wrap_content"

 							android:layout_height="wrap_content"

-							android:layout_gravity="bottom"

-							android:paddingTop="4dip"

-							android:paddingLeft="7dip"

-							android:paddingRight="7dip"

-							android:paddingBottom="4dip"/>

-

-						<Button

-							android:id="@+id/download_visualizer"

-							android:text="VIS"

-							android:textStyle="bold"

-							android:textSize="22sp"

-							android:background="@drawable/menubar_button"

-							android:layout_width="wrap_content"

-							android:layout_height="wrap_content"

-							android:layout_gravity="bottom"

-							android:paddingTop="4dip"

-							android:paddingLeft="7dip"

-							android:paddingRight="7dip"

-							android:paddingBottom="4dip"/>

-

-						<ImageButton

-							android:id="@+id/download_star"

-							android:layout_width="wrap_content"

-							android:layout_height="wrap_content"

-							android:layout_below="@+id/download_jukebox"

-							android:background="@drawable/menubar_button"

-							android:src="@android:drawable/star_big_off"

-							android:paddingTop="8dip"

-							android:paddingLeft="10dip"

-							android:paddingRight="10dip"

-							android:paddingBottom="8dip"/>

-					</LinearLayout>

+							android:layout_centerHorizontal="true">

+

+							<include layout="@layout/download_action_buttons"/>

+						</LinearLayout>

+					</RelativeLayout>

 

 					<LinearLayout

 						android:id="@+id/download_visualizer_view_layout"

+						android:orientation="horizontal"

 						android:layout_width="fill_parent"

 						android:layout_height="60dip"

 						android:layout_marginLeft="16dip"

diff --git a/res/layout/abstract_activity.xml b/res/layout/abstract_activity.xml
new file mode 100644
index 00000000..ed16c695
--- /dev/null
+++ b/res/layout/abstract_activity.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>

+<android.support.v4.widget.DrawerLayout

+	xmlns:android="http://schemas.android.com/apk/res/android"

+	android:id="@+id/drawer_layout"

+	android:layout_width="match_parent"

+	android:layout_height="match_parent">

+	<!-- The main content view -->

+	<FrameLayout

+		android:id="@+id/content_frame"

+		android:layout_width="match_parent"

+		android:layout_height="match_parent" />

+	<!-- The navigation drawer -->

+	<ListView android:id="@+id/left_drawer"

+			  android:layout_width="240dp"

+			  android:layout_height="match_parent"

+			  android:layout_gravity="start"

+			  android:choiceMode="singleChoice"

+			  android:divider="@android:color/transparent"

+			  android:dividerHeight="0dp"

+			  android:background="?android:windowBackground"/>

+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/res/layout/main.xml b/res/layout/abstract_fragment_activity.xml
index f1509db6..605b988a 100644
--- a/res/layout/main.xml
+++ b/res/layout/abstract_fragment_activity.xml
@@ -1,81 +1,85 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:gravity="center_horizontal"
-	android:orientation="vertical" >
-
-	<android.support.v4.view.ViewPager
-		android:id="@+id/pager"
-		android:layout_width="fill_parent"
-		android:layout_height="0px"
-		android:layout_weight="1" >
-	</android.support.v4.view.ViewPager>
-
-	<View
-		android:layout_width="fill_parent"
-		android:layout_height="1px"
-		android:background="@color/dividerColor"/>
-
-	<LinearLayout
-		android:id="@+id/bottom_bar"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:background="@drawable/media_button"
-		android:orientation="horizontal">
-
-		<ImageView
-			android:id="@+id/album_art"
-			android:layout_width="50dip"
-			android:layout_height="50dip"
-			android:layout_gravity="left|center"
-			android:scaleType="fitStart"
-			android:src="@drawable/unknown_album"/>
-
-		<LinearLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical"
-			android:layout_weight="1"
-			android:orientation="vertical"
-			android:paddingLeft="8dip">
-
-			<TextView
-				android:id="@+id/track_name"
-				android:layout_height="wrap_content"
-				android:layout_width="wrap_content"
-				android:textColor="?android:textColorPrimary"
-				android:singleLine="true"
-				android:textAppearance="?android:attr/textAppearanceSmall"
-				android:textSize="13sp"
-				android:text="@string/search.artists"/>
-
-			<TextView
-				android:id="@+id/artist_name"
-				android:layout_height="wrap_content"
-				android:layout_width="wrap_content"
-				android:textColor="?android:textColorSecondary"
-				android:singleLine="true"
-				android:textAppearance="?android:attr/textAppearanceSmall"
-				android:textSize="12sp"
-				android:text="@string/search.albums"/>
-		</LinearLayout>
-
-		<ImageButton
-			style="@style/PlaybackControl.Small"
-			android:id="@+id/download_previous"
-			android:src="?attr/media_button_backward"
-			android:layout_centerVertical="true"/>
-
-		<ImageButton
-			style="@style/PlaybackControl.Small"
-			android:id="@+id/download_start"
-			android:src="?attr/media_button_start"
-			android:layout_centerVertical="true"/>
-
-		<ImageButton
-			style="@style/PlaybackControl.Small"
-			android:id="@+id/download_next"
-			android:src="?attr/media_button_forward"
-			android:layout_centerVertical="true"/>
-	</LinearLayout>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

+	android:layout_width="match_parent"

+	android:layout_height="match_parent"

+	android:gravity="center_horizontal"

+	android:orientation="vertical" >

+

+	<include layout="@layout/abstract_fragment_container" />

+

+	<View

+		android:layout_width="fill_parent"

+		android:layout_height="1px"

+		android:background="@color/dividerColor"/>

+

+	<LinearLayout

+		android:id="@+id/bottom_bar"

+		android:layout_width="fill_parent"

+		android:layout_height="wrap_content"

+		android:background="@drawable/media_button"

+		android:orientation="horizontal">

+

+		<ImageView

+			android:id="@+id/album_art"

+			android:layout_width="50dip"

+			android:layout_height="50dip"

+			android:layout_gravity="left|center"

+			android:scaleType="fitStart"

+			android:src="@drawable/unknown_album"/>

+

+		<LinearLayout

+			android:layout_width="0dp"

+			android:layout_height="wrap_content"

+			android:layout_gravity="center_vertical"

+			android:layout_weight="1"

+			android:orientation="vertical"

+			android:paddingLeft="8dip">

+

+			<TextView

+				android:id="@+id/track_name"

+				android:layout_height="wrap_content"

+				android:layout_width="wrap_content"

+				android:textColor="?android:textColorPrimary"

+				android:singleLine="true"

+				android:textAppearance="?android:attr/textAppearanceSmall"

+				android:textSize="13sp"

+				android:text="@string/search.artists"/>

+

+			<TextView

+				android:id="@+id/artist_name"

+				android:layout_height="wrap_content"

+				android:layout_width="wrap_content"

+				android:textColor="?android:textColorSecondary"

+				android:singleLine="true"

+				android:textAppearance="?android:attr/textAppearanceSmall"

+				android:textSize="12sp"

+				android:text="@string/search.albums"/>

+		</LinearLayout>

+

+		<LinearLayout

+			android:layout_height="wrap_content"

+			android:layout_width="0dp"

+			android:layout_weight="1">

+

+			<ImageButton

+				style="@style/PlaybackControl.Small"

+				android:id="@+id/download_previous"

+				android:src="?attr/media_button_backward"

+				android:layout_width="0dp"

+				android:layout_weight="1"/>

+

+			<ImageButton

+				style="@style/PlaybackControl.Small"

+				android:id="@+id/download_start"

+				android:src="?attr/media_button_start"

+				android:layout_width="0dp"

+				android:layout_weight="1"/>

+

+			<ImageButton

+				style="@style/PlaybackControl.Small"

+				android:id="@+id/download_next"

+				android:src="?attr/media_button_forward"

+				android:layout_width="0dp"

+				android:layout_weight="1"/>

+		</LinearLayout>

+	</LinearLayout>

 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/abstract_fragment_container.xml b/res/layout/abstract_fragment_container.xml
new file mode 100644
index 00000000..d4a8607f
--- /dev/null
+++ b/res/layout/abstract_fragment_container.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>

+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

+	android:id="@+id/fragment_container"

+	android:layout_width="match_parent"

+	android:layout_height="0px"

+	android:layout_weight="1"/>
\ No newline at end of file
diff --git a/res/layout/select_podcasts.xml b/res/layout/abstract_list_fragment.xml
index ea4fb07c..bfce4792 100644
--- a/res/layout/select_podcasts.xml
+++ b/res/layout/abstract_list_fragment.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/select_podcasts_layout"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
-	android:orientation="vertical" >
-
-	<View
-		android:layout_width="fill_parent"
-		android:layout_height="1px"
-		android:background="@color/dividerColor"/>
-
-	<include layout="@layout/tab_progress" />
-
-	<TextView
-		android:id="@+id/select_podcasts_empty"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:padding="10dip"
-		android:text="@string/select_podcasts.empty"
-		android:visibility="gone" />
-
-	<ListView
-		android:id="@+id/select_podcasts_list"
-		android:layout_width="fill_parent"
-		android:layout_height="0dip"
-		android:layout_weight="1.0"
-		android:fastScrollEnabled="true"/>
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>

+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

+	android:id="@+id/fragment_list_layout"

+	android:layout_width="fill_parent"

+	android:layout_height="fill_parent"

+	android:orientation="vertical" >

+

+	<View

+		android:layout_width="fill_parent"

+		android:layout_height="1px"

+		android:background="@color/dividerColor"/>

+

+	<include layout="@layout/tab_progress" />

+

+	<TextView

+		android:id="@+id/fragment_list_empty"

+		android:layout_width="fill_parent"

+		android:layout_height="wrap_content"

+		android:padding="10dip"

+		android:text="@string/common.empty"

+		android:visibility="gone" />

+

+	<ListView

+		android:id="@+id/fragment_list"

+		android:layout_width="fill_parent"

+		android:layout_height="0dip"

+		android:layout_weight="1.0"

+		android:fastScrollEnabled="true"/>

+</LinearLayout>

diff --git a/res/layout/album_list_item.xml b/res/layout/album_list_item.xml
index ee710539..9051a72e 100644
--- a/res/layout/album_list_item.xml
+++ b/res/layout/album_list_item.xml
@@ -51,10 +51,10 @@
 

     <ImageView

 		android:id="@+id/album_more"

-		android:src="@drawable/list_item_more"

+		android:src="?attr/download_none"

 		android:layout_width="wrap_content"

 		android:layout_height="fill_parent"

 		android:layout_gravity="right|center_vertical"

-		android:paddingRight="6dip"

+		android:paddingRight="10dip"

 		android:background="@drawable/menubar_button"/>

 </LinearLayout>

diff --git a/res/layout/appwidget4x1.xml b/res/layout/appwidget4x1.xml
index 5e55aa37..68fecb9a 100644
--- a/res/layout/appwidget4x1.xml
+++ b/res/layout/appwidget4x1.xml
@@ -5,7 +5,8 @@
     android:minWidth="250dp"
     android:minHeight="40dp"
     android:background="@drawable/appwidget_bg"
-    android:orientation="horizontal" >
+    android:orientation="horizontal"
+	android:id="@+id/widget_root">
 
     <ImageView
         android:id="@+id/appwidget_coverart"
diff --git a/res/layout/appwidget4x2.xml b/res/layout/appwidget4x2.xml
index 575ae1c2..8409bbbf 100644
--- a/res/layout/appwidget4x2.xml
+++ b/res/layout/appwidget4x2.xml
@@ -5,7 +5,8 @@
     android:minWidth="250dp"
     android:minHeight="110dp"
     android:background="@drawable/appwidget_bg"
-    android:orientation="horizontal" >
+    android:orientation="horizontal"
+	android:id="@+id/widget_root">
 
     <ImageView
         android:id="@+id/appwidget_coverart"
diff --git a/res/layout/appwidget4x3.xml b/res/layout/appwidget4x3.xml
index b4f685bc..e72a266d 100644
--- a/res/layout/appwidget4x3.xml
+++ b/res/layout/appwidget4x3.xml
@@ -3,7 +3,8 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="@drawable/appwidget_bg"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+	android:id="@+id/widget_root">
 
     <ImageView
         android:id="@+id/appwidget_coverart"
diff --git a/res/layout/appwidget4x4.xml b/res/layout/appwidget4x4.xml
index 6e6c12ab..c885829b 100644
--- a/res/layout/appwidget4x4.xml
+++ b/res/layout/appwidget4x4.xml
@@ -3,7 +3,8 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    android:background="@drawable/appwidget_bg" >
+    android:background="@drawable/appwidget_bg"
+	android:id="@+id/widget_root">
 
     <ImageView
         android:id="@+id/appwidget_coverart"
diff --git a/res/layout/artist_list_item.xml b/res/layout/basic_list_item.xml
index edf1930e..2295a9ba 100644
--- a/res/layout/artist_list_item.xml
+++ b/res/layout/basic_list_item.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="horizontal"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:background="@android:color/transparent">
-		
-	<TextView
-		android:id="@+id/artist_name"
-		android:layout_width="0dip"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:gravity="left|center_vertical"
-		android:paddingLeft="6dip"
-		android:paddingRight="6dip"
-		android:minHeight="50dip"
-		android:background="@android:color/transparent"/>
-		
-	<ImageButton
-		android:id="@+id/artist_star"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="right|center_vertical"
-		android:src="@drawable/ic_stat_star"
-		android:background="@android:color/transparent"
-		android:focusable="false"
-		android:visibility="gone"/>
-
-    <ImageView
-		android:id="@+id/artist_more"
-		android:src="@drawable/list_item_more"
-		android:layout_width="wrap_content"
-		android:layout_height="fill_parent"
-		android:layout_gravity="right|center_vertical"
-		android:paddingRight="6dip"
-		android:background="@drawable/menubar_button"/>
+<?xml version="1.0" encoding="utf-8"?>

+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

+	android:orientation="horizontal"

+	android:layout_width="fill_parent"

+	android:layout_height="wrap_content"

+	android:background="@android:color/transparent">

+

+	<TextView

+		android:id="@+id/item_name"

+		android:layout_width="0dip"

+		android:layout_height="wrap_content"

+		android:layout_weight="1"

+		android:textAppearance="?android:attr/textAppearanceMedium"

+		android:gravity="left|center_vertical"

+		android:paddingLeft="6dip"

+		android:paddingRight="6dip"

+		android:minHeight="50dip"

+		android:background="@android:color/transparent"/>

+

+	<ImageButton

+		android:id="@+id/item_star"

+		android:layout_width="wrap_content"

+		android:layout_height="wrap_content"

+		android:layout_gravity="right|center_vertical"

+		android:src="@drawable/ic_stat_star"

+		android:background="@android:color/transparent"

+		android:focusable="false"

+		android:visibility="gone"/>

+

+	<ImageView

+		android:id="@+id/item_more"

+		android:src="?attr/download_none"

+		android:layout_width="wrap_content"

+		android:layout_height="fill_parent"

+		android:layout_gravity="right|center_vertical"

+		android:paddingRight="10dip"

+		android:background="@drawable/menubar_button"/>

 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/create_bookmark.xml b/res/layout/create_bookmark.xml
new file mode 100644
index 00000000..f72b39d8
--- /dev/null
+++ b/res/layout/create_bookmark.xml
@@ -0,0 +1,26 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:id="@+id/comment_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/common.comment" />
+		<EditText
+			android:id="@+id/comment_text"
+			android:inputType="text"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_marginLeft="4dp" />
+	</LinearLayout>
+</LinearLayout>
diff --git a/res/layout/download_action_buttons.xml b/res/layout/download_action_buttons.xml
new file mode 100644
index 00000000..e3a45151
--- /dev/null
+++ b/res/layout/download_action_buttons.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>

+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

+	android:id="@+id/download_other_controls_layout"

+	android:orientation="horizontal"

+	android:layout_width="wrap_content"

+	android:layout_height="wrap_content"

+	android:layout_gravity="center_horizontal">

+

+	<Button

+		android:id="@+id/download_jukebox"

+		android:text="RC"

+		style="@style/DownloadActionButton"/>

+

+	<Button

+		android:id="@+id/download_equalizer"

+		android:text="EQ"

+		style="@style/DownloadActionButton"/>

+

+	<Button

+		android:id="@+id/download_visualizer"

+		android:text="VIS"

+		style="@style/DownloadActionButton"/>

+

+	<ImageButton

+		android:id="@+id/download_star"

+		style="@style/DownloadActionImageButton"

+		android:src="@android:drawable/star_big_off"/>

+

+	<ImageButton

+		android:id="@+id/download_bookmark"

+		style="@style/DownloadActionImageButton"

+		android:src="?attr/bookmark"/>

+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/download_media_buttons.xml b/res/layout/download_media_buttons.xml
index 1835a373..1ccf6c68 100644
--- a/res/layout/download_media_buttons.xml
+++ b/res/layout/download_media_buttons.xml
@@ -54,7 +54,7 @@
     <ImageButton
             style="@style/PlaybackControl.Small"
 			android:id="@+id/download_toggle_list"
-			android:src="@drawable/action_toggle_list"
+			android:src="?attr/toggle_list"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             />
diff --git a/res/layout/drawer_list_item.xml b/res/layout/drawer_list_item.xml
new file mode 100644
index 00000000..a85d043e
--- /dev/null
+++ b/res/layout/drawer_list_item.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>

+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

+	android:orientation="horizontal"

+	android:layout_width="fill_parent"

+	android:layout_height="wrap_content"

+	android:paddingTop="8dip"

+	android:paddingBottom="9dip">

+

+	<ImageView

+		android:id="@+id/drawer_icon"

+		android:layout_width="wrap_content"

+		android:layout_height="wrap_content"

+		android:layout_gravity="left|center_vertical"

+		android:paddingTop="1dip"

+		android:paddingBottom="1dip"

+		android:paddingRight="8dip"

+		android:paddingLeft="10dip"/>

+

+	<TextView

+		android:id="@+id/drawer_name"

+		android:layout_width="wrap_content"

+		android:layout_height="wrap_content"

+		android:textSize="26sp"

+		android:textStyle="bold"

+		android:singleLine="true"/>

+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/equalizer.xml b/res/layout/equalizer.xml
index ee1a9560..6e3c7e5c 100644
--- a/res/layout/equalizer.xml
+++ b/res/layout/equalizer.xml
@@ -4,7 +4,6 @@
         android:orientation="vertical"

         android:layout_width="fill_parent"

         android:layout_height="fill_parent"

-        android:background="@drawable/album_art_background"

         android:padding="16dip">

 

     <CheckBox

@@ -12,7 +11,6 @@
             android:layout_width="wrap_content"

             android:layout_height="wrap_content"

             android:text="@string/equalizer.enabled"

-            android:textColor="#c0c0c0"

             android:textAppearance="?android:attr/textAppearanceMedium"/>

 

     <ScrollView

diff --git a/res/layout/equalizer_bar.xml b/res/layout/equalizer_bar.xml
index c34d1108..3a104e9b 100644
--- a/res/layout/equalizer_bar.xml
+++ b/res/layout/equalizer_bar.xml
@@ -6,8 +6,6 @@
 

     <TextView

             android:id="@+id/equalizer.frequency"

-            android:textSize="12sp"

-            android:textColor="#c0c0c0"

             android:layout_width="wrap_content"

             android:layout_height="wrap_content"

             android:layout_marginTop="8dp"

@@ -18,7 +16,6 @@
             android:id="@+id/equalizer.level"

             android:text="0 dB"

             android:textSize="12sp"

-            android:textColor="#c0c0c0"

             android:gravity="right"

             android:layout_width="wrap_content"

             android:layout_height="wrap_content"

diff --git a/res/layout/help.xml b/res/layout/help.xml
deleted file mode 100644
index f22dee37..00000000
--- a/res/layout/help.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent">
-
-    <LinearLayout android:id="@+id/help_buttons"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_weight="0"
-                  android:layout_alignParentBottom="true"
-                  android:padding="4dip"
-                  android:gravity="center_horizontal"
-                  android:background="#ffcccccc">
-
-        <Button android:id="@+id/help_back"
-                android:text="@string/help.back"
-                android:layout_width="wrap_content"
-                android:layout_height="fill_parent"
-                android:layout_marginRight="5dip"
-                android:paddingLeft="25dip"
-                android:paddingRight="25dip"/>
-
-        <Button android:id="@+id/help_close"
-                android:text="@string/help.close"
-                android:layout_width="wrap_content"
-                android:layout_height="fill_parent"
-                android:layout_marginLeft="5dip"
-                android:paddingLeft="25dip"
-                android:paddingRight="25dip"/>
-    </LinearLayout>
-
-
-    <WebView
-            android:id="@+id/help_contents"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@id/help_buttons"
-            android:layout_weight="1"
-            android:fadingEdge="vertical"
-            android:fadingEdgeLength="12dip"/>
-
-  </RelativeLayout>
diff --git a/res/layout/jukebox_volume.xml b/res/layout/jukebox_volume.xml
index 4bccaec7..fd718326 100644
--- a/res/layout/jukebox_volume.xml
+++ b/res/layout/jukebox_volume.xml
@@ -32,7 +32,7 @@
 		android:paddingRight="12dip"
 		android:layout_alignParentLeft="true"
 		android:layout_below="@+id/jukebox_volume_title"
-		android:src="@drawable/volume"/>
+		android:src="?attr/volume"/>
 
 	<SeekBar
 		android:layout_height="wrap_content"
diff --git a/res/layout/main_buttons.xml b/res/layout/main_buttons.xml
index 1e60838d..7729315c 100644
--- a/res/layout/main_buttons.xml
+++ b/res/layout/main_buttons.xml
@@ -15,7 +15,7 @@
             android:minHeight="?android:attr/listPreferredItemHeight">

 

         <ImageView

-                android:src="@drawable/main_select_server"

+                android:src="?attr/select_server"

                 android:layout_gravity="center_vertical"

                 android:layout_width="wrap_content"

                 android:layout_height="wrap_content"/>

@@ -71,7 +71,6 @@
     <TextView

             android:id="@+id/main_albums_newest"

             android:text="@string/main.albums_newest"

-            android:drawableRight="@drawable/list_item_more"

             android:drawablePadding="6dip"

             android:layout_width="fill_parent"

             android:layout_height="wrap_content"

@@ -83,7 +82,6 @@
     <TextView

             android:id="@+id/main_albums_recent"

             android:text="@string/main.albums_recent"

-            android:drawableRight="@drawable/list_item_more"

             android:drawablePadding="6dip"

             android:layout_width="fill_parent"

             android:layout_height="wrap_content"

@@ -95,7 +93,6 @@
     <TextView

             android:id="@+id/main_albums_frequent"

             android:text="@string/main.albums_frequent"

-            android:drawableRight="@drawable/list_item_more"

             android:drawablePadding="6dip"

             android:layout_width="fill_parent"

             android:layout_height="wrap_content"

@@ -107,7 +104,6 @@
     <TextView

             android:id="@+id/main_albums_highest"

             android:text="@string/main.albums_highest"

-            android:drawableRight="@drawable/list_item_more"

             android:drawablePadding="6dip"

             android:layout_width="fill_parent"

             android:layout_height="wrap_content"

@@ -119,7 +115,6 @@
     <TextView

             android:id="@+id/main_albums_starred"

             android:text="@string/main.albums_starred"

-            android:drawableRight="@drawable/list_item_more"

             android:drawablePadding="6dip"

             android:layout_width="fill_parent"

             android:layout_height="wrap_content"

@@ -131,7 +126,6 @@
 	<TextView

             android:id="@+id/main_albums_genres"

             android:text="@string/main.albums_genres"

-            android:drawableRight="@drawable/list_item_more"

             android:drawablePadding="6dip"

             android:layout_width="fill_parent"

             android:layout_height="wrap_content"

@@ -143,7 +137,6 @@
     <TextView

             android:id="@+id/main_albums_random"

             android:text="@string/main.albums_random"

-            android:drawableRight="@drawable/list_item_more"

             android:drawablePadding="6dip"

             android:layout_width="fill_parent"

             android:layout_height="wrap_content"

diff --git a/res/layout/notification.xml b/res/layout/notification.xml
index 22e2cb63..55c7be2a 100644
--- a/res/layout/notification.xml
+++ b/res/layout/notification.xml
@@ -14,10 +14,12 @@
 
     <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+		android:layout_weight="1"
         android:orientation="vertical"
-		android:paddingLeft="11.0dip">
+		android:paddingLeft="11.0dip"
+		android:layout_gravity="center_vertical">
 			
 		<TextView
 			android:id="@+id/notification_title"
@@ -28,76 +30,54 @@
 			android:ellipsize="marquee"
 			android:focusable="true"
 			android:singleLine="true" />
-			
-		<LinearLayout
-			xmlns:android="http://schemas.android.com/apk/res/android"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:orientation="horizontal" >
-
-			<LinearLayout
-				android:layout_width="0.0dp"
-				android:layout_height="wrap_content"
-				android:layout_gravity="center_vertical"
-				android:layout_weight="1.0"
-				android:orientation="vertical">
 
-				<TextView
-					android:id="@+id/notification_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/notification_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/notification_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>
+		<TextView
+			android:id="@+id/notification_album"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:visibility="gone"/>
+    </LinearLayout>
 
-			<ImageButton
-				android:id="@+id/control_previous"
-				android:src="@drawable/notification_prev"
-				android:background="@drawable/btn_bg"
-				android:layout_width="34dip"
-				android:layout_height="34dip"
-				android:layout_gravity="center|right"
-				android:layout_marginRight="10dip"
-				android:layout_marginTop="2dip"
-				android:layout_weight="0.0"
-				android:scaleType="fitXY"/>
+	<ImageButton
+		android:id="@+id/control_previous"
+		android:src="@drawable/notification_previous"
+		android:background="@drawable/btn_bg"
+		android:layout_width="46dip"
+		android:layout_height="fill_parent"
+		android:layout_gravity="center|right"
+		android:padding="8.0dip"
+		android:layout_weight="0.0"
+		android:scaleType="fitCenter"/>
 
-			<ImageButton
-				android:id="@+id/control_pause"
-				android:src="@drawable/notification_pause"
-				android:background="@drawable/btn_bg"
-				android:layout_width="34dip"
-				android:layout_height="34dip"
-				android:layout_gravity="center|right"
-				android:layout_marginRight="10dip"
-				android:layout_marginTop="2dip"
-				android:layout_weight="0.0"
-				android:scaleType="fitXY"/>
+	<ImageButton
+		android:id="@+id/control_pause"
+		android:src="@drawable/notification_pause"
+		android:background="@drawable/btn_bg"
+		android:layout_width="46dip"
+		android:layout_height="fill_parent"
+		android:layout_gravity="center|right"
+		android:padding="8.0dip"
+		android:layout_weight="0.0"
+		android:scaleType="fitCenter"/>
 
-			<ImageButton
-				android:id="@+id/control_next"
-				android:src="@drawable/notification_next"
-				android:background="@drawable/btn_bg"
-				android:layout_width="34dip"
-				android:layout_height="34dip"
-				android:layout_gravity="center|right"
-				android:layout_marginRight="10dip"
-				android:layout_marginTop="2dip"
-				android:layout_weight="0.0"
-				android:scaleType="fitXY"/>
-		</LinearLayout>
-    </LinearLayout>
+	<ImageButton
+		android:id="@+id/control_next"
+		android:src="@drawable/notification_next"
+		android:background="@drawable/btn_bg"
+		android:layout_width="46dip"
+		android:layout_height="fill_parent"
+		android:layout_gravity="center|right"
+		android:padding="8.0dip"
+		android:layout_weight="0.0"
+		android:scaleType="fitCenter"/>
 </LinearLayout>
diff --git a/res/layout/notification_expanded.xml b/res/layout/notification_expanded.xml
index 70e7269c..e2246506 100644
--- a/res/layout/notification_expanded.xml
+++ b/res/layout/notification_expanded.xml
@@ -70,7 +70,7 @@
 	            android:layout_weight="0.0"
 	            android:background="@drawable/btn_bg"
 	            android:scaleType="fitXY"
-	            android:src="@drawable/notification_prev" />
+	            android:src="@drawable/notification_previous" />
 
 	        <ImageButton
 	            android:id="@+id/control_pause"
diff --git a/res/layout/play_video.xml b/res/layout/play_video.xml
deleted file mode 100644
index 6a9f3f74..00000000
--- a/res/layout/play_video.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent">
-
-    <WebView
-            android:id="@+id/play_video_contents"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"/>
-
-</FrameLayout>
diff --git a/res/layout/playlist_list_item.xml b/res/layout/playlist_list_item.xml
deleted file mode 100644
index 1ec5753f..00000000
--- a/res/layout/playlist_list_item.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="horizontal"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content">
-		
-	<TextView
-		android:id="@+id/playlist_name"
-		android:layout_width="0dip"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:gravity="left|center_vertical"
-		android:paddingLeft="6dip"
-		android:paddingRight="6dip"
-		android:minHeight="50dip"/>
-
-    <ImageView
-		android:id="@+id/playlist_more"
-		android:src="@drawable/list_item_more"
-		android:layout_width="wrap_content"
-		android:layout_height="fill_parent"
-		android:layout_gravity="right|center_vertical"
-		android:paddingRight="6dip"
-		android:background="@drawable/menubar_button"/>
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/search.xml b/res/layout/search.xml
deleted file mode 100644
index d1c5c84c..00000000
--- a/res/layout/search.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

-              android:id="@+id/search_layout"

-              android:orientation="vertical"

-              android:layout_width="fill_parent"

-              android:layout_height="fill_parent">

-

-    <View

-            android:layout_width="fill_parent"

-            android:layout_height="1px"

-            android:background="@color/dividerColor"/>

-

-    <include layout="@layout/tab_progress"/>

-

-    <ListView

-            android:id="@+id/search_list"

-            android:layout_width="fill_parent"

-            android:layout_height="0dip"

-            android:layout_weight="1.0"

-            android:fastScrollEnabled="true"

-            />

-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/search_buttons.xml b/res/layout/search_buttons.xml
index 10b72166..3e3acfac 100644
--- a/res/layout/search_buttons.xml
+++ b/res/layout/search_buttons.xml
@@ -5,17 +5,6 @@
               android:layout_height="wrap_content">

 

     <TextView

-            android:id="@+id/search_search"

-            android:text="@string/search.search"

-            android:layout_width="fill_parent"

-            android:layout_height="wrap_content"

-            android:drawablePadding="0dp"

-            android:drawableLeft="@drawable/search"

-            android:textAppearance="?android:attr/textAppearanceMedium"

-            android:gravity="center"

-            android:padding="12dp"/>

-

-    <TextView

             android:id="@+id/search_artists"

             android:text="@string/search.artists"

             android:layout_width="fill_parent"

@@ -82,4 +71,3 @@
             android:paddingBottom="8dp"/>

 

 </LinearLayout>

-

diff --git a/res/layout/select_album_footer.xml b/res/layout/select_album_footer.xml
deleted file mode 100644
index c1a30a1a..00000000
--- a/res/layout/select_album_footer.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

-              android:orientation="horizontal"

-              android:background="@android:color/transparent"

-              android:paddingTop="6dp"

-              android:paddingBottom="0dp"

-              android:layout_width="fill_parent"

-              android:layout_height="wrap_content">

-

-        <Button android:id="@+id/select_album_more"

-                android:text="@string/select_album.more"

-                android:textAppearance="?android:attr/textAppearanceSmall"

-                android:visibility="gone"

-                android:layout_marginLeft="6dp"

-                android:layout_marginRight="6dp"

-                android:layout_weight="1"

-                android:layout_width="0dp"

-                android:layout_height="fill_parent"/>

-

-</LinearLayout>

-

diff --git a/res/layout/select_artist.xml b/res/layout/select_artist.xml
deleted file mode 100644
index fef51d3c..00000000
--- a/res/layout/select_artist.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

-	android:id="@+id/select_artist_layout"

-	android:orientation="vertical"

-	android:layout_width="fill_parent"

-	android:layout_height="fill_parent">

-

-	<View

-		android:layout_width="fill_parent"

-		android:layout_height="1px"

-		android:background="@color/dividerColor"/>

-

-	<include layout="@layout/tab_progress"/>

-

-	<ListView android:id="@+id/select_artist_list"

-		android:textFilterEnabled="true"

-		android:fastScrollEnabled="true"

-		android:layout_width="fill_parent"

-		android:layout_height="0dip"

-		android:layout_weight="1.0"/>

-</LinearLayout>

-

diff --git a/res/layout/select_artist_header.xml b/res/layout/select_artist_header.xml
index 0b3d151b..ba1b3d47 100644
--- a/res/layout/select_artist_header.xml
+++ b/res/layout/select_artist_header.xml
@@ -14,7 +14,7 @@
 			android:minHeight="?android:attr/listPreferredItemHeight">

 

 		<ImageView

-				android:src="@drawable/main_select_server"

+				android:src="?attr/select_server"

 				android:layout_gravity="center_vertical"

 				android:layout_width="wrap_content"

 				android:layout_height="wrap_content"/>

diff --git a/res/layout/select_genres.xml b/res/layout/select_genres.xml
deleted file mode 100644
index 95f9d415..00000000
--- a/res/layout/select_genres.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/select_genre_layout"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
-
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:orientation="vertical" >
-
-		<include layout="@layout/tab_progress" />
-
-		<TextView
-			android:id="@+id/select_genre_empty"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:padding="10dip"
-			android:text="@string/select_genre.empty"
-			android:visibility="gone" />
-
-		<ListView
-			android:id="@+id/select_genre_list"
-			android:layout_width="fill_parent"
-			android:layout_height="0dip"
-			android:layout_weight="1.0"
-			android:textFilterEnabled="true"
-			android:fastScrollEnabled="true"/>
-	</LinearLayout>
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/select_playlist.xml b/res/layout/select_playlist.xml
deleted file mode 100644
index e18283bd..00000000
--- a/res/layout/select_playlist.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

-	android:id="@+id/select_playlist_layout"

-	android:orientation="vertical"

-	android:layout_width="fill_parent"

-	android:layout_height="fill_parent">

-

-	<View

-		android:layout_width="fill_parent"

-		android:layout_height="1px"

-		android:background="@color/dividerColor"/>

-

-	<include layout="@layout/tab_progress"/>

-

-	<TextView

-		android:id="@+id/select_playlist_empty"

-		android:text="@string/select_playlist.empty"

-		android:layout_width="fill_parent"

-		android:layout_height="wrap_content"

-		android:padding="10dip"

-		android:visibility="gone"/>

-

-	<ListView android:id="@+id/select_playlist_list"

-		android:layout_width="fill_parent"

-		android:layout_height="0dip"

-		android:layout_weight="1.0"

-		android:fastScrollEnabled="true"/>

-

-</LinearLayout>

-

diff --git a/res/layout/song_list_item.xml b/res/layout/song_list_item.xml
index 90060894..3bf7ab44 100644
--- a/res/layout/song_list_item.xml
+++ b/res/layout/song_list_item.xml
@@ -48,12 +48,20 @@
 				android:visibility="gone"/>

 

             <TextView

-                    android:id="@+id/song_status"

-                    android:layout_width="wrap_content"

-                    android:layout_height="wrap_content"

-                    android:layout_gravity="right|center_vertical"

-                    android:drawablePadding="1dip"

-                    android:paddingRight="6dip"/>

+				android:id="@+id/song_status"

+				android:layout_width="wrap_content"

+				android:layout_height="wrap_content"

+				android:layout_gravity="right|center_vertical"

+				android:drawablePadding="1dip"

+				android:paddingRight="2dip"/>

+

+			<ImageView

+				android:id="@+id/song_status_icon"

+				android:layout_width="24dip"

+				android:layout_height="24dip"

+				android:layout_gravity="center_vertical"

+				android:src="?attr/downloading"

+				android:visibility="gone"/>

         </LinearLayout>

 

         <LinearLayout android:orientation="horizontal"

@@ -87,10 +95,10 @@
 	

 	<ImageView

 		android:id="@+id/artist_more"

-		android:src="@drawable/list_item_more"

+		android:src="?attr/download_none"

 		android:layout_width="wrap_content"

 		android:layout_height="fill_parent"

 		android:layout_gravity="right|center_vertical"

-		android:paddingRight="6dip"

+		android:paddingRight="10dip"

 		android:background="@drawable/menubar_button"/>

 </LinearLayout>

diff --git a/res/menu/chat.xml b/res/menu/abstract_top_menu.xml
index 685aba18..46419d0f 100644
--- a/res/menu/chat.xml
+++ b/res/menu/abstract_top_menu.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-	  xmlns:compat="http://schemas.android.com/apk/res-auto">
-	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
-		android:title="@string/menu.refresh"
-		compat:showAsAction="always|withText"/>
-
-	<item 
-		android:id="@+id/menu_settings"
-		android:icon="@drawable/action_settings"
-		android:title="@string/menu.settings"/>
-
-	<item 
-		android:id="@+id/menu_exit"
-		android:icon="@drawable/action_exit"
-		android:title="@string/menu.exit"/>
-</menu>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>

+<menu xmlns:android="http://schemas.android.com/apk/res/android"

+	  xmlns:compat="http://schemas.android.com/apk/res-auto">

+	<item

+		android:id="@+id/menu_refresh"

+		android:icon="?attr/refresh"

+		android:title="@string/menu.refresh"

+		compat:showAsAction="always|withText"/>

+

+	<item

+		android:id="@+id/menu_search"

+		android:icon="?attr/search"

+		android:title="@string/menu.search"

+		compat:showAsAction="always|withText"/>

+

+	<item

+		android:id="@+id/menu_exit"

+		android:title="@string/menu.exit"/>

+</menu>

diff --git a/res/menu/drawer_menu.xml b/res/menu/drawer_menu.xml
new file mode 100644
index 00000000..c2969938
--- /dev/null
+++ b/res/menu/drawer_menu.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<menu xmlns:android="http://schemas.android.com/apk/res/android"

+	  xmlns:compat="http://schemas.android.com/apk/res-auto">

+

+	<item

+		android:id="@+id/menu_exit"

+		android:title="@string/menu.exit"/>

+</menu>

diff --git a/res/menu/empty.xml b/res/menu/empty.xml
index 979eefe4..9bb43bf7 100644
--- a/res/menu/empty.xml
+++ b/res/menu/empty.xml
@@ -3,7 +3,7 @@
 	  xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
+		android:icon="?attr/refresh"
 		android:title="@string/menu.refresh"
 		compat:showAsAction="always|withText"/>
 </menu>
diff --git a/res/menu/main.xml b/res/menu/main.xml
index 1390b68b..5e504242 100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -3,24 +3,18 @@
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_search"
-		android:icon="@drawable/action_search"
+		android:icon="?attr/search"
 		android:title="@string/menu.search"
 		compat:showAsAction="always|withText"/>
 	
 	<item 
 		android:id="@+id/menu_shuffle"
-		android:icon="@drawable/action_shuffle"
+		android:icon="?attr/shuffle"
 		android:title="@string/menu.shuffle"
 		compat:showAsAction="always|withText"/>
-
-	<item 
-		android:id="@+id/menu_help"
-		android:icon="@drawable/action_help"
-		android:title="@string/menu.help"/>
 		
 	<item 
 		android:id="@+id/menu_about"
-		android:icon="@drawable/action_help"
 		android:title="@string/menu.about"/>
 		
 	<item 
@@ -31,14 +25,7 @@
 		android:id="@+id/menu_changelog"
 		android:title="@string/changelog_full_title"/>
 
-	<item 
-		android:id="@+id/menu_settings"
-		android:icon="@drawable/action_settings"
-		android:title="@string/menu.settings"/>
-
-	<item 
+	<item
 		android:id="@+id/menu_exit"
-		android:icon="@drawable/action_exit"
 		android:title="@string/menu.exit"/>
-
 </menu>
diff --git a/res/menu/nowplaying.xml b/res/menu/nowplaying.xml
index ae411240..3c9c5ba6 100644
--- a/res/menu/nowplaying.xml
+++ b/res/menu/nowplaying.xml
@@ -3,27 +3,25 @@
 	  xmlns:compat="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/menu_shuffle"
-        android:icon="@drawable/action_shuffle"
+        android:icon="?attr/shuffle"
         android:title="@string/download.menu_shuffle"
         compat:showAsAction="ifRoom|withText"/>
 		
 	<item
         android:id="@+id/menu_remove_all"
-        android:icon="@drawable/action_remove_all"
+        android:icon="?attr/remove"
         android:title="@string/download.menu_remove_all"
         compat:showAsAction="ifRoom|withText"/>
 
     <item
         android:id="@+id/menu_save_playlist"
-        android:icon="@drawable/action_save"
+        android:icon="?attr/save"
         android:title="@string/download.menu_save"
         compat:showAsAction="ifRoom|withText"/>
 
     <item
         android:id="@+id/menu_screen_on_off"
-        android:icon="@drawable/action_screen_on_off"
-        android:title="@string/download.menu_screen_on"
-        compat:showAsAction="ifRoom|withText"/>
+        android:title="@string/download.menu_screen_on"/>
 		
 	<item
         android:id="@+id/menu_toggle_timer"
@@ -32,9 +30,8 @@
 	<item
         android:id="@+id/menu_toggle_now_playing"
         android:title="@string/download.show_downloading"/>
-		
-	<item 
+
+	<item
 		android:id="@+id/menu_exit"
-		android:icon="@drawable/action_exit"
 		android:title="@string/menu.exit"/>
 </menu>
diff --git a/res/menu/nowplaying_downloading.xml b/res/menu/nowplaying_downloading.xml
index fbdb78f4..50ab00f3 100644
--- a/res/menu/nowplaying_downloading.xml
+++ b/res/menu/nowplaying_downloading.xml
@@ -3,19 +3,9 @@
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item
         android:id="@+id/menu_remove_all"
-        android:icon="@drawable/action_remove_all"
+        android:icon="?attr/remove"
         android:title="@string/download.menu_remove_all"
         compat:showAsAction="always|withText"/>
-
-    <item
-        android:id="@+id/menu_screen_on_off"
-        android:icon="@drawable/action_screen_on_off"
-        android:title="@string/download.menu_screen_on"
-        compat:showAsAction="ifRoom|withText"/>
-		
-	<item
-        android:id="@+id/menu_toggle_timer"
-        android:title="@string/download.start_timer"/>
 		
 	<item
         android:id="@+id/menu_toggle_now_playing"
@@ -23,6 +13,5 @@
 		
 	<item 
 		android:id="@+id/menu_exit"
-		android:icon="@drawable/action_exit"
 		android:title="@string/menu.exit"/>
 </menu>
diff --git a/res/menu/nowplaying_offline.xml b/res/menu/nowplaying_offline.xml
index 3800c013..41d1d5d1 100644
--- a/res/menu/nowplaying_offline.xml
+++ b/res/menu/nowplaying_offline.xml
@@ -4,28 +4,25 @@
 
     <item
         android:id="@+id/menu_shuffle"
-        android:icon="@drawable/action_shuffle"
+        android:icon="?attr/shuffle"
         android:title="@string/download.menu_shuffle"
         compat:showAsAction="always|withText"/>
 		
 	<item
         android:id="@+id/menu_remove_all"
-        android:icon="@drawable/action_remove_all"
+        android:icon="?attr/remove"
         android:title="@string/download.menu_remove_all"
         compat:showAsAction="always|withText"/>
 	
 	<item
         android:id="@+id/menu_screen_on_off"
-        android:icon="@drawable/action_screen_on_off"
-        android:title="@string/download.menu_screen_on"
-        compat:showAsAction="ifRoom|withText"/>
+        android:title="@string/download.menu_screen_on"/>
 		
 	<item
         android:id="@+id/menu_toggle_timer"
         android:title="@string/download.start_timer"/>
 		
-	<item 
+	<item
 		android:id="@+id/menu_exit"
-		android:icon="@drawable/action_exit"
 		android:title="@string/menu.exit"/>
 </menu>
diff --git a/res/menu/search.xml b/res/menu/search.xml
index fa361566..cab9c4f6 100644
--- a/res/menu/search.xml
+++ b/res/menu/search.xml
@@ -3,23 +3,12 @@
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_search"
-		android:icon="@drawable/action_search"
+		android:icon="?attr/search"
 		android:title="@string/menu.search"
 		compat:showAsAction="ifRoom|withText"/>
 
 	<item 
-		android:id="@+id/menu_help"
-		android:icon="@drawable/ic_menu_help"
-		android:title="@string/menu.help"/>
-
-	<item 
-		android:id="@+id/menu_settings"
-		android:icon="@drawable/ic_menu_settings"
-		android:title="@string/menu.settings"/>
-
-	<item 
 		android:id="@+id/menu_exit"
-		android:icon="@drawable/ic_menu_exit"
 		android:title="@string/menu.exit"/>
 
 </menu>
diff --git a/res/menu/select_album.xml b/res/menu/select_album.xml
index 329c479c..469561f1 100644
--- a/res/menu/select_album.xml
+++ b/res/menu/select_album.xml
@@ -3,19 +3,19 @@
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_play_now"
-		android:icon="@drawable/action_play_all"
+		android:icon="?media_button_start"
 		android:title="@string/menu.play"
 		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
+		android:icon="?attr/refresh"
 		android:title="@string/menu.refresh"
 		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_shuffle"
-		android:icon="@drawable/action_shuffle"
+		android:icon="?attr/shuffle"
 		android:title="@string/menu.shuffle"
 		compat:showAsAction="ifRoom|withText"/>
 </menu>
diff --git a/res/menu/select_album_list.xml b/res/menu/select_album_list.xml
index 635a36bf..60b636e3 100644
--- a/res/menu/select_album_list.xml
+++ b/res/menu/select_album_list.xml
@@ -3,7 +3,7 @@
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
+		android:icon="?attr/refresh"
 		android:title="@string/menu.refresh"
 		compat:showAsAction="always|withText"/>
 </menu>
diff --git a/res/menu/select_artist.xml b/res/menu/select_artist.xml
index 3c694cd2..d1e1f4e3 100644
--- a/res/menu/select_artist.xml
+++ b/res/menu/select_artist.xml
@@ -3,29 +3,23 @@
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
+		android:icon="?attr/refresh"
 		android:title="@string/menu.refresh"
 		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_shuffle"
-		android:icon="@drawable/action_shuffle"
+		android:icon="?attr/shuffle"
 		android:title="@string/menu.shuffle"
 		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_search"
-		android:icon="@drawable/action_search"
+		android:icon="?attr/search"
 		android:title="@string/menu.search"
 		compat:showAsAction="ifRoom|withText"/>
 
-	<item 
-		android:id="@+id/menu_settings"
-		android:icon="@drawable/action_settings"
-		android:title="@string/menu.settings"/>
-
-	<item 
+	<item
 		android:id="@+id/menu_exit"
-		android:icon="@drawable/action_exit"
 		android:title="@string/menu.exit"/>
 </menu>
diff --git a/res/menu/select_bookmark_context.xml b/res/menu/select_bookmark_context.xml
new file mode 100644
index 00000000..af11c86f
--- /dev/null
+++ b/res/menu/select_bookmark_context.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	
+	<item
+		android:id="@+id/bookmark_menu_info"
+		android:title="@string/common.info"/>
+		
+	<item 
+		android:id="@+id/song_menu_download"
+		android:title="@string/common.download"/>
+		
+	<item 
+		android:id="@+id/song_menu_pin"
+		android:title="@string/common.pin"/>
+		
+	<item 
+		android:id="@+id/song_menu_delete"
+		android:title="@string/common.delete"/>
+		
+	<item 
+		android:id="@+id/bookmark_menu_delete"
+		android:title="@string/bookmark.delete"/>
+</menu>
diff --git a/res/menu/select_genres.xml b/res/menu/select_genres.xml
index 7ce7f1a0..837b3534 100644
--- a/res/menu/select_genres.xml
+++ b/res/menu/select_genres.xml
@@ -3,17 +3,7 @@
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
+		android:icon="?attr/refresh"
 		android:title="@string/menu.refresh"
 		compat:showAsAction="always|withText"/>
-
-	<item 
-		android:id="@+id/menu_settings"
-		android:icon="@drawable/action_settings"
-		android:title="@string/menu.settings"/>
-
-	<item 
-		android:id="@+id/menu_exit"
-		android:icon="@drawable/action_exit"
-		android:title="@string/menu.exit"/>
 </menu>
\ No newline at end of file
diff --git a/res/menu/select_playlist.xml b/res/menu/select_playlist.xml
deleted file mode 100644
index 4c4cc302..00000000
--- a/res/menu/select_playlist.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-		xmlns:compat="http://schemas.android.com/apk/res-auto">
-	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
-		android:title="@string/menu.refresh"
-		compat:showAsAction="always|withText"/>
-		
-	<item 
-		android:id="@+id/menu_search"
-		android:icon="@drawable/action_search"
-		android:title="@string/menu.search"
-		compat:showAsAction="always|withText"/>
-
-	<item 
-		android:id="@+id/menu_settings"
-		android:icon="@drawable/action_settings"
-		android:title="@string/menu.settings"/>
-
-	<item 
-		android:id="@+id/menu_exit"
-		android:icon="@drawable/action_exit"
-		android:title="@string/menu.exit"/>
-</menu>
diff --git a/res/menu/select_podcast_episode.xml b/res/menu/select_podcast_episode.xml
index 7e79d0f7..8472325a 100644
--- a/res/menu/select_podcast_episode.xml
+++ b/res/menu/select_podcast_episode.xml
@@ -3,7 +3,7 @@
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
+		android:icon="?attr/refresh"
 		android:title="@string/menu.refresh"
 		compat:showAsAction="always|withText"/>
 		
@@ -13,6 +13,5 @@
 
 	<item 
 		android:id="@+id/menu_delete"
-		android:icon="@drawable/action_remove_all"
 		android:title="@string/common.delete"/>
 </menu>
diff --git a/res/menu/select_podcast_episode_offline.xml b/res/menu/select_podcast_episode_offline.xml
index cb6d1a3b..4d464c1f 100644
--- a/res/menu/select_podcast_episode_offline.xml
+++ b/res/menu/select_podcast_episode_offline.xml
@@ -3,12 +3,11 @@
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
+		android:icon="?attr/refresh"
 		android:title="@string/menu.refresh"
 		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_delete"
-		android:icon="@drawable/action_remove_all"
 		android:title="@string/common.delete"/>
 </menu>
diff --git a/res/menu/select_podcasts.xml b/res/menu/select_podcasts.xml
index 6c1ffa07..212feb04 100644
--- a/res/menu/select_podcasts.xml
+++ b/res/menu/select_podcasts.xml
@@ -3,27 +3,25 @@
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
+		android:icon="?attr/refresh"
 		android:title="@string/menu.refresh"
 		compat:showAsAction="always|withText"/>
 
+	<item
+		android:id="@+id/menu_search"
+		android:icon="?attr/search"
+		android:title="@string/menu.search"
+		compat:showAsAction="always|withText"/>
+
 	<item 
 		android:id="@+id/menu_add_podcast"
-		android:icon="@drawable/action_exit"
 		android:title="@string/menu.add_podcast"/>
 
 	<item 
 		android:id="@+id/menu_check"
-		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.check_podcasts"/>
 
-	<item 
-		android:id="@+id/menu_settings"
-		android:icon="@drawable/action_settings"
-		android:title="@string/menu.settings"/>
-
-	<item 
+	<item
 		android:id="@+id/menu_exit"
-		android:icon="@drawable/action_exit"
 		android:title="@string/menu.exit"/>
 </menu>
\ No newline at end of file
diff --git a/res/menu/select_podcasts_context_offline.xml b/res/menu/select_podcasts_context_offline.xml
new file mode 100644
index 00000000..cbc76224
--- /dev/null
+++ b/res/menu/select_podcasts_context_offline.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item
+		android:id="@+id/podcast_channel_info"
+		android:title="@string/common.info"/>
+</menu>
\ No newline at end of file
diff --git a/res/menu/select_song.xml b/res/menu/select_song.xml
index 658e3ffe..d60dedac 100644
--- a/res/menu/select_song.xml
+++ b/res/menu/select_song.xml
@@ -3,45 +3,37 @@
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_play_now"
-		android:icon="@drawable/action_play_all"
+		android:icon="?attr/media_button_start"
 		android:title="@string/menu.play"
 		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
+		android:icon="?attr/refresh"
 		android:title="@string/menu.refresh"
 		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_shuffle"
-		android:icon="@drawable/action_shuffle"
+		android:icon="?attr/shuffle"
 		android:title="@string/menu.shuffle"
 		compat:showAsAction="ifRoom|withText"/>
 		
 	<item 
 		android:id="@+id/menu_select"
-		android:icon="@drawable/action_select"
-		android:title="@string/menu.select"
-		compat:showAsAction="ifRoom|withText"/>
+		android:title="@string/menu.select"/>
 		
 	<item 
 		android:id="@+id/menu_download"
-		android:icon="@drawable/action_save"
-		android:title="@string/common.download"
-		compat:showAsAction="ifRoom|withText"/>
+		android:title="@string/common.download"/>
 		
 	<item 
 		android:id="@+id/menu_cache"
-		android:icon="@drawable/action_save"
-		android:title="@string/common.pin"
-		compat:showAsAction="ifRoom|withText"/>
+		android:title="@string/common.pin"/>
 		
 	<item 
 		android:id="@+id/menu_delete"
-		android:icon="@drawable/action_remove_all"
-		android:title="@string/common.delete"
-		compat:showAsAction="ifRoom|withText"/>
+		android:title="@string/common.delete"/>
 	
 	<item 
 		android:id="@+id/menu_add_playlist"
@@ -53,7 +45,5 @@
 		
 	<item 
 		android:id="@+id/menu_play_last"
-		android:icon="@drawable/action_play_all"
-		android:title="@string/menu.play_last"
-		compat:showAsAction="ifRoom|withText"/>
+		android:title="@string/menu.play_last"/>
 </menu>
diff --git a/res/menu/select_song_offline.xml b/res/menu/select_song_offline.xml
index 7588d9ad..88e9758d 100644
--- a/res/menu/select_song_offline.xml
+++ b/res/menu/select_song_offline.xml
@@ -3,37 +3,31 @@
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_play_now"
-		android:icon="@drawable/action_play_all"
+		android:icon="?attr/media_button_start"
 		android:title="@string/menu.play"
 		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
+		android:icon="?attr/refresh"
 		android:title="@string/menu.refresh"
 		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_shuffle"
-		android:icon="@drawable/action_shuffle"
+		android:icon="?attr/shuffle"
 		android:title="@string/menu.shuffle"
 		compat:showAsAction="ifRoom|withText"/>
 		
 	<item 
 		android:id="@+id/menu_select"
-		android:icon="@drawable/action_select"
-		android:title="@string/menu.select"
-		compat:showAsAction="ifRoom|withText"/>
+		android:title="@string/menu.select"/>
 		
 	<item 
 		android:id="@+id/menu_delete"
-		android:icon="@drawable/action_remove_all"
-		android:title="@string/common.delete"
-		compat:showAsAction="ifRoom|withText"/>
+		android:title="@string/common.delete"/>
 		
 	<item 
 		android:id="@+id/menu_play_last"
-		android:icon="@drawable/action_play_all"
-		android:title="@string/menu.play_last"
-		compat:showAsAction="ifRoom|withText"/>
+		android:title="@string/menu.play_last"/>
 </menu>
diff --git a/res/raw/changelog.xml b/res/raw/changelog.xml
index d4ec275a..819263ac 100644
--- a/res/raw/changelog.xml
+++ b/res/raw/changelog.xml
@@ -1,5 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+	<release version="4.2.0" versioncode="69" releasedate="11/14/2013">
+		<change>Changed from tabs to Pull Out Drawer like newer Google docs specify</change>
+		<change>Major UI update with better scaling icons</change>
+		<change>Updated main app icon (thanks Ben Sumner)</change>
+		<change>Added tablet layout that better uses extra space</change>
+		<change>New Bookmarks tab</change>
+		<change>Persistent notification is like other music apps now (change in settings)</change>
+		<change>Ability to hide Podcasts/Bookmarks/Chat tabs</change>
+		<change>Pressing next with repeat all on loops back to beginning</change>
+		<change>Increase right padding so context buttons are easier to press</change>
+	</release>
+	<release version="4.1.8" versioncode="66" releasedate="10/26/2013">
+		<change>Fix offline shuffle mode</change>
+	</release>
+	<release version="4.1.7" versioncode="65" releasedate="10/21/2013">
+		<change>Settings screen now broken down by sections</change>
+		<change>Added option to choose whether or not to pause on headphone/bluetooth disconnect</change>
+		<change>Added confirm for clearing current queue</change>
+		<change>Added option to hide widget while nothing is playing</change>
+		<change>Fix not being able to change position in Jukebox mode</change>
+		<change>Fix position not being saved sometimes when pausing during a streamed song</change>
+		<change>Fix sometimes the letters not matching the position on the artist list</change>
+		<change>Various minor bug fixes</change>
+	</release>
+	<release version="4.1.6" versioncode="64" releasedate="10/3/2013">
+		<change>Fix recent update sometimes messing up downloaded song</change>
+		<change>Fix changing position while streaming a song</change>
+	</release>
+	<release version="4.1.5" versioncode="63" releasedate="9/27/2013">
+		<change>Notification while doing background downloads, clicking will show you the download list</change>
+		<change>Put songs in the root directory in a new folder called Root at the bottom of the list</change>
+		<change>Speedup of saving/loading current playing list (mostly matters for those using large playlists)</change>
+		<change>Cache most common folder listings for better experience while network is intermittent</change>
+		<change>Speedup of offline playlist loading</change>
+		<change>Fix app reloading data/losing position on orientation change</change>
+		<change>Fix Show Album from now playing list</change>
+		<change>Fix using shuffle in offline mode sometimes using online songs</change>
+		<change>Various optimizations and bug fixes</change>
+	</release>
 	<release version="4.1.4" versioncode="61" releasedate="8/25/2013">
 		<change>Fix for freezes on 4.3</change>
 		<change>Fix for starred songs/albums not being clickable</change>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
new file mode 100644
index 00000000..594ff0b9
--- /dev/null
+++ b/res/values-es/strings.xml
@@ -0,0 +1,401 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="common.appname">DSub</string>
+    <string name="common.ok">OK</string>
+    <string name="common.save">Guardar</string>
+    <string name="common.cancel">Cancelar</string>
+    <string name="common.play_now">Reproducir</string>
+	<string name="common.play_shuffled">Reproducir en aleatorio</string>
+    <string name="common.play_next">Siguiente en la cola</string>
+    <string name="common.play_last">Reproducir al final</string>
+	<string name="common.download">Caché</string>
+    <string name="common.pin">Caché permanente</string>
+    <string name="common.delete">Borrar</string>
+	<string name="common.star">Poner estrella</string>
+	<string name="common.unstar">Quitar estrella</string>
+	<string name="common.info">Detalles</string>
+	<string name="common.name">Nombre</string>
+	<string name="common.comment">Comentar</string>
+	<string name="common.public">Público</string>
+	<string name="common.play_external">Reproducir vídeo</string>
+	<string name="common.stream_external">Stream Video</string>
+	<string name="common.confirm">Confirmar</string>
+	<string name="common.confirm_message">Quieres %1$s %2$s?</string>
+
+    <string name="button_bar.home">Inicio</string>
+    <string name="button_bar.browse">Biblioteca</string>
+    <string name="button_bar.search">Buscar</string>
+    <string name="button_bar.playlists">Listas de reproducción</string>
+    <string name="button_bar.now_playing">Ahora suena</string>
+	<string name="button_bar.podcasts">Podcasts</string>
+	<string name="button_bar.chat">Chat</string>
+
+    <string name="main.welcome_title">Bienvenido!</string>
+    <string name="main.welcome_text">Bienvenido a DSub! Ahora la aplicación está configurada para usar el servidor de demostración de Subsonic. Cuando configures tu servidor personal (disponible en <b>subsonic.org</b>), accede a <b>Preferencias</b> y cambia la configuración para conectarte.</string>
+	<string name="main.about_title">Acerca de DSub</string>
+	<string name="main.about_text">Autor: Scott Jackson
+		\nEmail: daneren2005@gmail.com
+		\nVersión: %1$s
+		\nEspacio usado: %2$s of %3$s
+		\nEspacio disponible: %4$s of %5$s</string>
+    <string name="main.select_server">Seleccionar servidor</string>
+    <string name="main.shuffle">Reproducción aleatoria</string>
+    <string name="main.offline">Modo Offline</string>
+	<string name="main.online">Modo Online</string>
+    <string name="main.settings">Preferencias</string>
+    <string name="main.albums_title">Discos</string>
+    <string name="main.albums_newest">Añadidos recientemente</string>
+    <string name="main.albums_recent">Reproducidos recientemente</string>
+    <string name="main.albums_frequent">Más reproducidos</string>
+    <string name="main.albums_highest">Mejor valorados</string>
+    <string name="main.albums_starred">Con estrella</string>
+    <string name="main.albums_random">Aleatorio</string>
+	<string name="main.albums_genres">Géneros</string>
+	<string name="main.back_confirm">Pulsa atrás de nuevo para salir</string>
+
+	<string name="menu.search">Buscar</string>
+	<string name="menu.shuffle">Aleatorio</string>
+	<string name="menu.refresh">Actualizar</string>
+	<string name="menu.select">Seleccionar todo</string>
+	<string name="menu.play">Reproducir</string>
+	<string name="menu.play_last">Reproducir al final</string>
+    <string name="menu.exit">Salir</string>
+    <string name="menu.settings">Preferencias</string>
+    <string name="menu.help">Ayuda</string>
+	<string name="menu.about">Acerca de</string>
+	<string name="menu.add_playlist">Añadir a lista de reproducción</string>
+	<string name="menu.remove_playlist">Borrar de lista de reproducción</string>
+	<string name="menu.deleted_playlist">Listas borradas %s</string>
+	<string name="menu.deleted_playlist_error">Error al borrar la lista de reproducción %s</string>
+	<string name="menu.log">Enviar Log</string>
+	<string name="menu.set_timer">Ajustar temporizador</string>
+	<string name="menu.check_podcasts">Comprobar nuevos episodios</string>
+	<string name="menu.add_podcast">Añadir canal</string>
+	<string name="menu.cast">Enviar al dispositivo</string>
+
+    <string name="playlist.label">Listas de reproducción</string>
+	<string name="playlist.update_info">Actualizar información</string>
+	<string name="playlist.updated_info">Información actualizada para la lista %s</string>
+	<string name="playlist.updated_info_error">Error al actualizar la información de la lista %s</string>
+	<string name="playlist.overwrite">Sobreescribir lista de reproducción actual</string>
+	<string name="playlist.add_to">Añadir a lista de reproducción</string>
+	<string name="playlist.create_new">Crear nueva</string>
+
+    <string name="help.label">Ayuda</string>
+    <string name="help.title">Bienvenido a DSub!</string>
+    <string name="help.back">Atrás</string>
+    <string name="help.close">Cerrar</string>
+    <string name="help.url">file:///android_asset/html/en/index.html</string>
+    <string name="help.loading">Cargando...</string>
+
+    <string name="play_video.loading">Cargando vídeo...</string>
+    <string name="play_video.noplugin">Por favor instala Adobe Flash player desde el Android Market.</string>
+
+    <string name="search.label">Buscar</string>
+    <string name="search.title">Buscar</string>
+    <string name="search.search">Click para buscar</string>
+    <string name="search.no_match">No hay coincidencias, inténtelo de nuevo</string>
+    <string name="search.artists">Artista</string>
+    <string name="search.albums">Disco</string>
+    <string name="search.songs">Canción</string>
+    <string name="search.more">Mostrar más</string>
+
+    <string name="progress.wait">Espere por favor...</string>
+
+    <string name="music_library.label">Biblioteca de medios</string>
+    <string name="music_library.label_offline">Archivos Offline</string>
+
+    <string name="select_album.empty">Vacío</string>
+    <string name="select_album.select">Seleccionar todo</string>
+    <string name="select_album.n_selected">Seleccionadas %d canciones</string>
+    <string name="select_album.n_unselected">%d canciones deseleccionadas</string>
+    <string name="select_album.more">Más</string>
+    <string name="select_album.offline">Offline</string>
+    <string name="select_album.searching">Buscando...</string>
+    <string name="select_album.no_sdcard">Error: No hay tarjeta SD disponible</string>
+    <string name="select_album.no_network">Aviso: No hay red disponible</string>
+    <string name="select_album.not_licensed">Servidor sin licencia. Quedan %d días de prueba</string>
+    <string name="select_album.donate_dialog_message">Consigue descargas ilimitadas haciendo una donación a Subsonic</string>
+    <string name="select_album.donate_dialog_now">Ahora</string>
+    <string name="select_album.donate_dialog_later">Más tarde</string>
+    <string name="select_album.donate_dialog_0_trial_days_left">Periodo de prueba terminado</string>
+
+    <string name="offline.sync_dialog_title">Canciones offline esperando a ser sincronizadas</string>
+    <string name="offline.sync_dialog_message">Procesar %1$d offline scrobbles?
+		\nProcesar %2$d estrellas offline?
+	</string>
+	<string name="offline.sync_dialog_default">Usar esta acción por defecto</string>
+	<string name="offline.sync_success">%1$d canciones sincronizadas correctamente</string>
+	<string name="offline.sync_partial">%1$d de %2$d canciones sincronizadas</string>
+	<string name="offline.sync_error">Error al sincronizar canciones</string>
+
+	<string name="select_genre.empty">No se han encontrado géneros</string>
+	<string name="select_genre.blank">Vacío</string>
+
+	<string name="select_podcasts.empty">No se han encontrado podcasts</string>
+	<string name="select_podcasts.error">Ha habido un error descargando este podcast en el servidor. El servidor debe descargarlo antes.</string>
+	<string name="select_podcasts.skipped">Este podcast no ha sido descargado en el servidor. El servidor debe descargarlo antes.</string>
+    <string name="select_podcasts.initializing">Este podcast está siendo reiniciado en el servidor. Por favor, actualice en unos segundos.</string>
+	<string name="select_podcasts.server_download">Descargar en el servidor</string>
+	<string name="select_podcasts.server_delete">Borrar en el servidor</string>
+	<string name="select_podcasts.downloading">Descargando %s en el servidor</string>
+	<string name="select_podcasts.refreshing">El servidor está comprobando nuevos podcasts ahora</string>
+	<string name="select_podcasts.deleted">Podcasts eliminados %s</string>
+	<string name="select_podcasts.deleted_error">Error al elimintar el podcast %s</string>
+	<string name="select_podcasts.add_url">URL:</string>
+	<string name="select_podcasts.created_error">Error al agregar podcast</string>
+	<string name="select_podcasts.invalid_podcast_channel">Canal de podcast no valido: %s</string>
+
+    <string name="select_playlist.empty">No hay listas de reproducción guardadas en el servidor</string>
+
+    <string name="download.empty">Lista de reproducción vaía</string>
+	<string name="download.shuffle_loading">Cargando lista aleatoria...</string>
+    <string name="download.playerstate_downloading">Descargando - %s</string>
+    <string name="download.playerstate_buffering">Buffering</string>
+    <string name="download.playerstate_playing_shuffle">Reproduciendo en aleatorio</string>
+    <string name="download.menu_show_album">Mostrar disco</string>
+    <string name="download.menu_lyrics">Letras</string>
+    <string name="download.menu_remove">Eliminar de la cola</string>
+	<string name="download.menu_delete">Borrar cache</string>
+    <string name="download.menu_remove_all">Borrar todo</string>
+    <string name="download.menu_screen_on">Pantalla encendida</string>
+    <string name="download.menu_screen_off">Pantalla apagada</string>
+    <string name="download.menu_shuffle">Aleatorio</string>
+	<string name="download.menu_toggle">Cambiar</string>
+    <string name="download.menu_save">Guardar lista de reproducción</string>
+    <string name="download.menu_shuffle_notification">Lista de reproducción en aleatorio</string>
+    <string name="download.playlist_title">Guardar lista de reproducción</string>
+    <string name="download.playlist_name">Introduce un nombre válido para la lista de reproducción:</string>
+    <string name="download.playlist_saving">Guardando lista de reproducción \"%s\"...</string>
+    <string name="download.playlist_done">Lista de reproducción guardada.</string>
+    <string name="download.playlist_error">Error al guardar la lista de reproducción, inténtelo más tarde.</string>
+    <string name="download.repeat_off">Repetir off</string>
+    <string name="download.repeat_all">Repetir todo</string>
+    <string name="download.repeat_single">Repetir canción</string>
+    <string name="download.visualizer_on">Visualizador encendido.</string>
+    <string name="download.visualizer_off">Visualizador apagado.</string>
+    <string name="download.jukebox_on">Control remoto encendido. La música se está reproduciendo en el ordenador.</string>
+    <string name="download.jukebox_off">Control remoto apagado. La música se está reproduciendo en el dispositivo móvil.</string>
+    <string name="download.jukebox_volume">Volumen remoto</string>
+    <string name="download.jukebox_server_too_old">Control remoto no soportado. Por favor, actualice su servidor Subsonic.</string>
+    <string name="download.jukebox_offline">Control remoto no disponible en modo offline.</string>
+    <string name="download.jukebox_not_authorized">Control remoto no permitido. Por favor, active el modo jukebox en <b>Users &gt; Settings</b> en su servidor Subsonic.</string>
+	<string name="download.show_downloading">Mostrar descargas</string>
+	<string name="download.show_now_playing">Mostrar reproduciendo ahora</string>
+	<string name="download.timer_length">Temporizador</string>
+	<string name="download.start_timer">Iniciar temporizador</string>
+	<string name="download.stop_timer">Detener temporizador</string>
+	<string name="download.need_download">El vídeo ha de ser descargado antes</string>
+	<string name="download.no_streaming_player">Ningún reproductor puede reproducir este stream</string>
+	<string name="download.playing_out_of">Reproduciendo: %1$d/%2$d</string>
+    
+	<string name="starring_content_starred">Marcado con estrella \"%s\"</string>
+	<string name="starring_content_unstarred">Sin marca de estrella \"%s\"</string>
+    <string name="starring_content_error">Error al actualizar \"%s\", inténtelo más tarde.</string>
+	
+	<string name="playlist_error">Error al obtener las listas de reproducción</string>
+	<string name="updated_playlist">Añadida %1$s canción a \"%2$s\"</string>
+    <string name="updated_playlist_error">Error al actualizar \"%s\", inténtelo más tarde.</string>
+	<string name="removed_playlist">Borrar %1$s canciones de \"%2$s\"</string>
+
+    <string name="song_details.all">%1$s %2$s</string>
+    <string name="song_details.kbps">%d kbps</string>
+	<string name="song_details.error">Error</string>
+	<string name="song_details.skipped">Saltados</string>
+	<string name="song_details.downloading">Descargando</string>
+
+    <string name="lyrics.nomatch">No se han encontrado letras</string>
+
+    <string name="error.label">Error</string>
+
+    <string name="settings.title">Ajustes de DSub</string>
+    <string name="settings.test_connection_title">Comprobar conexión</string>
+	<string name="settings.servers_add">Añadir servidor</string>
+	<string name="settings.servers_remove">Borrar servidor</string>
+    <string name="settings.servers_title">Servidores</string>
+    <string name="settings.server_unused">Sin usar</string>
+    <string name="settings.server_name">Nombre</string>
+    <string name="settings.server_address">Dirección del servidor</string>
+    <string name="settings.server_username">Usuario</string>
+    <string name="settings.server_password">Contraseña</string>
+	<string name="settings.server_open_browser">Abrir en el navegador</string>
+    <string name="settings.cache_title">Caché de música</string>
+    <string name="settings.preload_wifi">Canciones para precargar (Wifi)</string>
+	<string name="settings.preload_mobile">Canciones pare precargar (Móvil)</string>
+    <string name="settings.cache_size">Tamaño de caché (MB)</string>
+    <string name="settings.cache_location">Ruta de caché</string>
+    <string name="settings.cache_location_error">Ruta de caché no válida. Utilizando la opción por defecto.</string>
+	<string name="settings.cache_clear">Limpiar cache</string>
+	<string name="settings.cache_clear_complete">Caché limpiada</string>
+    <string name="settings.testing_connection">Probando conexión...</string>
+    <string name="settings.testing_ok">Conexión correcta</string>
+    <string name="settings.testing_unlicensed">Conexión correcta. Servidor sin licencia.</string>
+    <string name="settings.connection_failure">Error de conexión.</string>
+    <string name="settings.invalid_url">Introduzca una URL válida.</string>
+    <string name="settings.invalid_username">Por favor, especifique un usuario válido.</string>
+    <string name="settings.appearance_title">Apariencia</string>
+    <string name="settings.theme_title">Tema</string>
+    <string name="settings.theme_light">Claro</string>
+    <string name="settings.theme_dark">Oscuro</string>
+	<string name="settings.theme_black">Negro</string>
+	<string name="settings.theme_holo">Holo</string>
+	<string name="settings.theme_light_fullscreen">Claro pantalla completa</string>
+    <string name="settings.theme_dark_fullscreen">Oscuro pantalla completa</string>
+	<string name="settings.theme_black_fullscreen">Negro pantalla completa</string>
+	<string name="settings.theme_holo_fullscreen">Holo pantalla completa</string>
+	<string name="settings.track_title">Mostrar número de pista</string>
+	<string name="settings.track_summary">Mostrar número de pista al inicio de la canción si existe</string>
+    <string name="settings.network_title">Red</string>
+    <string name="settings.max_bitrate_wifi">Bitrate máximo - Wi-Fi</string>
+    <string name="settings.max_bitrate_mobile">Bitrate máximo - Móvil</string>
+    <string name="settings.max_bitrate_32">32 Kbps</string>
+    <string name="settings.max_bitrate_64">64 Kbps</string>
+    <string name="settings.max_bitrate_80">80 Kbps</string>
+    <string name="settings.max_bitrate_96">96 Kbps</string>
+    <string name="settings.max_bitrate_112">112 Kbps</string>
+    <string name="settings.max_bitrate_128">128 Kbps</string>
+    <string name="settings.max_bitrate_160">160 Kbps</string>
+    <string name="settings.max_bitrate_192">192 Kbps</string>
+    <string name="settings.max_bitrate_256">256 Kbps</string>
+    <string name="settings.max_bitrate_320">320 Kbps</string>
+	<string name="settings.max_video_bitrate_wifi">Bitrate de vídeo máximo - Wi-Fi</string>
+    <string name="settings.max_video_bitrate_mobile">Bitrate de vídeo máximo - Móvil</string>
+	<string name="settings.max_video_bitrate_200">200 Kbps</string>
+    <string name="settings.max_video_bitrate_300">300 Kbps</string>
+    <string name="settings.max_video_bitrate_400">400 Kbps</string>
+    <string name="settings.max_video_bitrate_500">500 Kbps</string>
+    <string name="settings.max_video_bitrate_700">700 Kbps</string>
+    <string name="settings.max_video_bitrate_1000">1000 Kbps</string>
+    <string name="settings.max_video_bitrate_1500">1500 Kbps</string>
+    <string name="settings.max_video_bitrate_2000">2000 Kbps</string>
+    <string name="settings.max_video_bitrate_3000">3000 Kbps</string>
+    <string name="settings.max_video_bitrate_5000">5000 Kbps</string>
+    <string name="settings.max_bitrate_unlimited">Ilimitado</string>
+    <string name="settings.wifi_required_title">Streaming sólo en Wi-Fi</string>
+    <string name="settings.wifi_required_summary">Sólo utilizar streaming si estás conectado a Wi-Fi</string>
+	<string name="settings.network_timeout_title">Network Timeout</string>
+	<string name="settings.network_timeout_10000">10 seconds</string>
+	<string name="settings.network_timeout_15000">15 seconds</string>
+	<string name="settings.network_timeout_30000">30 seconds</string>
+	<string name="settings.network_timeout_45000">45 seconds</string>
+	<string name="settings.network_timeout_60000">60 seconds</string>
+    <string name="settings.preload_1">1 canción</string>
+    <string name="settings.preload_2">2 canciones</string>
+    <string name="settings.preload_3">3 canciones</string>
+    <string name="settings.preload_5">5 canciones</string>
+    <string name="settings.preload_10">10 canciones</string>
+	<string name="settings.preload_unlimited">Ilimitado</string>
+    <string name="settings.clear_search_history">Borrar historial de búsqueda</string>
+    <string name="settings.search_history_cleared">Historial de búsqueda borrado</string>
+    <string name="settings.other_title">Otros ajustes</string>
+    <string name="settings.scrobble_title">Scrobblear a Last.fm</string>
+    <string name="settings.scrobble_summary">Recuerde configurar su usuario y contraseña de Last.fm en su servidor</string>
+    <string name="settings.hide_media_title">Ocultar del resto</string>
+    <string name="settings.hide_media_summary">Ocultar archivos de música de otras aplicaciones.</string>
+    <string name="settings.hide_media_toast">Se aplicará la próxima vez que Android escanee la música de su teléfono.</string>
+    <string name="settings.media_button_title">Botones multimedia</string>
+    <string name="settings.media_button_summary">Responder a los botones Bluetooth, teléfono y manos libres</string>
+    <string name="settings.screen_lit_title">Mantener pantalla encendida</string>
+    <string name="settings.screen_lit_summary">Mantener la pantalla encendida durantes las descargas mejora la velocidad de descarga.</string>
+	<string name="settings.playlist_title">Listas de reproducción</string>
+	<string name="settings.playlist_random_size_title">Tamaño aleatorio</string>
+	<string name="settings.buffer_length">Tamaño del buffer (0 = totalmente en caché)</string>
+	<string name="settings.sleep_timer_title">Temporizador</string>
+	<string name="settings.sleep_timer_duration_title">Duración del temporizador</string>
+	<string name="settings.sleep_timer_off">Encendido</string>
+	<string name="settings.sleep_timer_on">Apagado</string>
+	<string name="settings.sleep_timer_always_on">Siempre encendido</string>
+	<string name="settings.temp_loss_title">Pérdida temporal de foco</string>
+	<string name="settings.temp_loss_pause">Pausar siempre</string>
+	<string name="settings.temp_loss_pause_lower">Pausar, bajar el volumen cuando sea solicitado</string>
+	<string name="settings.temp_loss_lower">Bajar volumen siempre</string>
+	<string name="settings.temp_loss_nothing">No hacer nada</string>
+	<string name="settings.persistent_title">Notificación permanente</string>
+	<string name="settings.persistent_summary">Mostrar la notificación incluso tras pausar. Pulsar botón stop para quitarlo.</string>
+	<string name="settings.gapless_playback">Reproducción sin pausas</string>
+	<string name="settings.gapless_playback_summary">El Galaxy S3 parece sufrir algunos bloqueos y funcionamentos extraños desde la introducción de la reproducción sin pausas. Desmarca esta opción para solucionar el problema.</string>
+	<string name="settings.chat_refresh">Tiempo de actualización de chat (Segundos)</string>
+	<string name="settings.chat_enabled">Chat habilitado</string>
+	<string name="settings.chat_enabled_summary">Para mostrar o no mostrar la pestaña de chat. Reinicia la aplicación tras el cambio.</string>
+	<string name="settings.video_title">Vídeo</string>
+	<string name="settings.video_player">Reproductor de vídeo</string>
+	<string name="settings.video_raw">Raw (Requiere Subsonic 4.8+)</string>
+	<string name="settings.video_hls">HTTP Live Stream (HLS) (Requiere Subsonic 4.8+)</string>
+	<string name="settings.video_transcode">Transcodificación directa (Requisitos de vídeo -> configurar mp4 o similar en el servidor)</string>
+	<string name="settings.video_flash">Flash (Requiere Plugin)</string>
+
+	<string name="shuffle.title">Iniciar aleatorio por</string>
+	<string name="shuffle.startYear">Año inicial:</string>
+	<string name="shuffle.endYear">Año final:</string>
+	<string name="shuffle.genre">Género:</string>
+	<string name="shuffle.pick_genre">Seleccionar género</string>
+
+    <string name="music_service.retry">Error de red. Reintentando %1$d de %2$d.</string>
+
+    <string name="background_task.wait">Por favor, espere...</string>
+    <string name="background_task.loading">Cargando.</string>
+    <string name="background_task.no_network">Este programa requiere de acceso a la red. Encienda el Wi-Fi o la conexión de datos móviles.</string>
+    <string name="background_task.network_error">Error de red. Por favor, compruebe la dirección del servidor o inténtelo más tarde.</string>
+    <string name="background_task.not_found">Recurso no encontrado. Por favor, compruebe la dirección del servidor.</string>
+    <string name="background_task.parse_error">Respuesta desconocida. Por favor, compruebe la dirección del servidor.</string>
+
+    <string name="service.connecting">Conectando con el servidor, espere por favor.</string>
+
+    <string name="parser.reading">Leyendo desde el servidor.</string>
+    <string name="parser.reading_done">Leyendo desde el servidor. Hecho!</string>
+    <string name="parser.upgrade_client">Versiones incompatibles. Por favor, actualice la aplicación DSub de Android.</string>
+    <string name="parser.upgrade_server">Versiones incompatibles. Por favor, actualice su servidor Subsonic.</string>
+    <string name="parser.not_authenticated">Usuario o contraseña inconrrectos.</string>
+    <string name="parser.not_authorized">Sin autorización. Compruebe los permisos en el servidor Subsonic.</string>
+    <string name="parser.artist_count">Recibidos %d artistas.</string>
+
+    <string name="select_artist.refresh">Actualizar</string>
+    <string name="select_artist.folder">Seleccionar carpeta</string>
+    <string name="select_artist.all_folders">Todas las carpetas</string>
+
+    <string name="equalizer.label">Ecualizador</string>
+    <string name="equalizer.enabled">Activado</string>
+    <string name="equalizer.preset">Seleccionar preset</string>
+
+	<string name="widget.4x1">DSub (4x1)</string>
+	<string name="widget.4x2">DSub (4x2)</string>
+	<string name="widget.4x3">DSub (4x3)</string>
+	<string name="widget.4x4">DSub (4x4)</string>
+    <string name="widget.initial_text">Toca para seleccionar música</string>
+    <string name="widget.sdcard_busy">Tarjeta SD no disponible</string>
+    <string name="widget.sdcard_missing">No hay tarjeta SD</string>
+
+    <string name="util.bytes_format.gigabyte">0.00 GB</string>
+    <string name="util.bytes_format.megabyte">0.00 MB</string>
+    <string name="util.bytes_format.kilobyte">0 KB</string>
+    <string name="util.bytes_format.byte">0 B</string>
+
+	<string name="changelog_full_title">Log de cambios</string>
+    <string name="changelog_title">Novedades</string>
+    <string name="changelog_ok_button">OK</string>
+    <string name="changelog_show_full">Más…</string>
+
+	<string name="chat.send_a_message">Enviar un mensaje</string> 
+
+    <string name="changelog_version_format" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">Version <xliff:g id="version_name">%s</xliff:g></string>
+
+    <plurals name="select_album_n_songs">
+        <item quantity="zero">Sin canciones</item>
+        <item quantity="one">Una canción</item>
+        <item quantity="other">%d canciones</item>
+    </plurals>
+    <plurals name="select_album_n_songs_downloading">
+        <item quantity="one">Una canción programada para descarga.</item>
+        <item quantity="other">%d canciones programadas para descarga.</item>
+    </plurals>
+    <plurals name="select_album_n_songs_added">
+        <item quantity="one">Canción añadida a la cola.</item>
+        <item quantity="other">%d canciones añadidas a la cola.</item>
+    </plurals>
+    <plurals name="select_album_donate_dialog_n_trial_days_left">
+        <item quantity="one">Queda un día del periodo de prueba</item>
+        <item quantity="other">Quedan %d días del periodo de prueba</item>
+    </plurals>
+
+</resources>
diff --git a/res/values-large/dimens.xml b/res/values-large/dimens.xml
new file mode 100644
index 00000000..4e29290d
--- /dev/null
+++ b/res/values-large/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>

+<resources>

+	<dimen name="Button">64dip</dimen>

+	<dimen name="Button.Small">54dip</dimen>

+</resources>
\ No newline at end of file
diff --git a/res/values-v16/themes.xml b/res/values-v16/themes.xml
new file mode 100644
index 00000000..aabcfaa9
--- /dev/null
+++ b/res/values-v16/themes.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>

+<resources>

+	<style name="DSub.TextViewStyle" parent="android:Widget.TextView">

+		<item name="android:fontFamily">sans-serif-light</item>

+	</style>

+

+	<style name="DSub.ButtonStyle" parent="android:Widget.Holo.Button">

+		<item name="android:fontFamily">sans-serif-light</item>

+	</style>

+</resources>
\ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index b558d68e..7e90c727 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,5 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<string-array name="drawerItems">
+		<item>@string/button_bar.home</item>
+		<item>@string/button_bar.browse</item>
+		<item>@string/button_bar.playlists</item>
+		<item>@string/button_bar.podcasts</item>
+		<item>@string/button_bar.bookmarks</item>
+		<item>@string/button_bar.chat</item>
+		<item>@string/menu.settings</item>
+	</string-array>
+
+	<string-array name="drawerItemsDescriptions">
+		<item>Home</item>
+		<item>Artist</item>
+		<item>Playlist</item>
+		<item>Podcast</item>
+		<item>Bookmark</item>
+		<item>Chat</item>
+		<item>Settings</item>
+	</string-array>
+
+	<array name="drawerItemIconsLight">
+		<item>@drawable/main_offline_light</item>
+		<item>@drawable/ic_menu_library_light</item>
+		<item>@drawable/ic_menu_playlist_light</item>
+		<item>@drawable/ic_menu_podcast_light</item>
+		<item>@drawable/ic_menu_bookmark_light</item>
+		<item>@drawable/ic_menu_chat_light</item>
+		<item>@drawable/ic_menu_settings_light</item>
+	</array>
+
+	<array name="drawerItemIconsDark">
+		<item>@drawable/main_offline_dark</item>
+		<item>@drawable/ic_menu_library_dark</item>
+		<item>@drawable/ic_menu_playlist_dark</item>
+		<item>@drawable/ic_menu_podcast_dark</item>
+		<item>@drawable/ic_menu_bookmark_dark</item>
+		<item>@drawable/ic_menu_chat_dark</item>
+		<item>@drawable/ic_menu_settings_dark</item>
+	</array>
 
     <string-array name="themeValues">
         <item>light</item>
@@ -137,6 +176,19 @@
 		<item>@string/settings.temp_loss_nothing</item>
 	</string-array>
 
+	<string-array name="disconnectPauseValues">
+		<item>0</item>
+		<item>1</item>
+		<item>2</item>
+		<item>3</item>
+	</string-array>
+	<string-array name="disconnectPauseNames">
+		<item>@string/settings.disconnect_pause_both</item>
+		<item>@string/settings.disconnect_pause_headphone</item>
+		<item>@string/settings.disconnect_pause_bluetooth</item>
+		<item>@string/settings.disconnect_pause_neither</item>
+	</string-array>
+
 	<string-array name="videoPlayerValues">
 		<item>raw</item>
 		<item>hls</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 8f669cd2..ae0939f1 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -7,6 +7,17 @@
     <attr name="media_button_repeat_off" format="reference"/>
     <attr name="media_button_start" format="reference"/>
     <attr name="media_button_stop" format="reference"/>
-	<attr name="chat" format="reference"/> 
-	<attr name="chat_send" format="reference" /> 
+	<attr name="chat_send" format="reference"/>
+	<attr name="download_none" format="reference"/>
+	<attr name="shuffle" format="reference"/>
+	<attr name="refresh" format="reference"/>
+	<attr name="search" format="reference"/>
+	<attr name="remove" format="reference"/>
+	<attr name="save" format="reference"/>
+	<attr name="volume" format="reference"/>
+	<attr name="toggle_list" format="reference"/>
+	<attr name="select_server" format="reference"/>
+	<attr name="downloading" format="reference"/>
+	<attr name="bookmark" format="reference"/>
+	<attr name="drawerItemsIcons" format="reference"/>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
new file mode 100644
index 00000000..b504b105
--- /dev/null
+++ b/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>

+<resources>

+	<dimen name="Button">54dip</dimen>

+	<dimen name="Button.Small">46dip</dimen>

+</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 87667e51..52c899e2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -22,13 +22,15 @@
 	<string name="common.stream_external">Stream Video</string>

 	<string name="common.confirm">Confirm</string>

 	<string name="common.confirm_message">Do you want to %1$s %2$s?</string>

+	<string name="common.empty">None found</string>

 

     <string name="button_bar.home">Home</string>

     <string name="button_bar.browse">Library</string>

     <string name="button_bar.search">Search</string>

     <string name="button_bar.playlists">Playlists</string>

-    <string name="button_bar.now_playing">Playing</string>

+    <string name="button_bar.now_playing">Now Playing</string>

 	<string name="button_bar.podcasts">Podcasts</string>

+	<string name="button_bar.bookmarks">Bookmarks</string>

 	<string name="button_bar.chat">Chat</string>

 

     <string name="main.welcome_title">Welcome!</string>

@@ -130,10 +132,8 @@
 	<string name="offline.sync_partial">Successfully synced %1$d of %2$d songs</string>

 	<string name="offline.sync_error">Failed to sync songs</string>

 

-	<string name="select_genre.empty">No genres found</string>

 	<string name="select_genre.blank">Blank</string>

 

-	<string name="select_podcasts.empty">No podcasts found</string>

 	<string name="select_podcasts.error">This podcast had an error while downloading on the server.  The server must download it first.</string>

 	<string name="select_podcasts.skipped">This podcast has not been downloaded on the server.  The server must download it first.</string>

     <string name="select_podcasts.initializing">This podcast channel is being initialized on the server.  Please reload after a moment.</string>

@@ -147,8 +147,6 @@
 	<string name="select_podcasts.created_error">Failed to add podcast</string>

 	<string name="select_podcasts.invalid_podcast_channel">Invalid podcast channel: %s</string>

 

-    <string name="select_playlist.empty">No saved playlists on server</string>

-

     <string name="download.empty">Playlist is empty</string>

 	<string name="download.shuffle_loading">Shuffle list is loading...</string>

     <string name="download.playerstate_downloading">Downloading - %s</string>

@@ -189,6 +187,8 @@
 	<string name="download.need_download">Video needs to be downloaded first</string>

 	<string name="download.no_streaming_player">No player can play this stream</string>

 	<string name="download.playing_out_of">Playing: %1$d/%2$d</string>

+	<string name="download.save_bookmark_title">Create bookmark</string>

+	<string name="download.save_bookmark">Bookmark created</string>

     

 	<string name="starring_content_starred">Starred \"%s\"</string>

 	<string name="starring_content_unstarred">Unstarred \"%s\"</string>

@@ -198,6 +198,17 @@
 	<string name="updated_playlist">Added %1$s songs to \"%2$s\"</string>

     <string name="updated_playlist_error">Failed to update \"%s\", please try later.</string>

 	<string name="removed_playlist">Removed %1$s songs from \"%2$s\"</string>

+	

+	<string name="bookmark.delete">Delete bookmark</string>

+	<string name="bookmark.delete_title">Delete the bookmark for</string>

+	<string name="bookmark.deleted">Deleted the bookmark for \"%s\"</string>

+	<string name="bookmark.deleted_error">Failed to delete the bookmark for \"%s\"</string>

+	<string name="bookmark.details_title">Bookmark Details</string>

+	<string name="bookmark.details">Song: %1$s

+		\nPosition: %2$s

+		\nCreated: %3$s

+		\nLast Updated: %4$s

+		\nComment: %5$s</string>

 

     <string name="song_details.all">%1$s %2$s</string>

     <string name="song_details.kbps">%d kbps</string>

@@ -290,7 +301,7 @@
     <string name="settings.search_history_cleared">Search history cleared</string>

     <string name="settings.other_title">Other settings</string>

     <string name="settings.scrobble_title">Scrobble to Last.fm</string>

-    <string name="settings.scrobble_summary">Remember to set up your Last.fm user and password on the DSub server</string>

+    <string name="settings.scrobble_summary">Remember to set up your Last.fm user and password on the Subsonic server</string>

     <string name="settings.hide_media_title">Hide from other</string>

     <string name="settings.hide_media_summary">Hide music files from other apps.</string>

     <string name="settings.hide_media_toast">Takes effect next time Android scans your phone for music.</string>

@@ -311,19 +322,32 @@
 	<string name="settings.temp_loss_pause_lower">Pause, lower volume when requested</string>

 	<string name="settings.temp_loss_lower">Always lower volume</string>

 	<string name="settings.temp_loss_nothing">Do Nothing</string>

+	<string name="settings.disconnect_pause_title">Pause on Disconnect</string>

+	<string name="settings.disconnect_pause_both">Pause on either</string>

+	<string name="settings.disconnect_pause_headphone">Pause only for headphone</string>

+	<string name="settings.disconnect_pause_bluetooth">Pause only for bluetooth</string>

+	<string name="settings.disconnect_pause_neither">Do Nothing</string>

 	<string name="settings.persistent_title">Persistent Notification</string>

 	<string name="settings.persistent_summary">Show the notification even after pausing.  Press the stop button to clear it away.</string>

 	<string name="settings.gapless_playback">Gapless Playback</string>

 	<string name="settings.gapless_playback_summary">The Galaxy S3 seems to be experiencing freezes/other weird issue since the introduction of gapless playback.  Turn this off to fix the issue.</string>

 	<string name="settings.chat_refresh">Chat Refresh Rate (Secs)</string>

 	<string name="settings.chat_enabled">Chat Enabled</string>

-	<string name="settings.chat_enabled_summary">Whether or not to display the chat tab.  Restart app after changing.</string>

+	<string name="settings.chat_enabled_summary">Whether or not to display the chat listing in the pull out drawer</string>

 	<string name="settings.video_title">Video</string>

 	<string name="settings.video_player">Video Player</string>

 	<string name="settings.video_raw">Raw (Requires Subsonic 4.8+)</string>

 	<string name="settings.video_hls">HTTP Live Stream (HLS) (Requires Subsonic 4.8+)</string>

 	<string name="settings.video_transcode">Direct Transcode (Requires video -> mp4 or similar setup on Server)</string>

 	<string name="settings.video_flash">Flash (Requires Plugin)</string>

+	<string name="settings.cache_screen_title">Cache/Network</string>

+	<string name="settings.playback_title">Playback</string>

+	<string name="settings.hide_widget_title">Hide Widget</string>

+	<string name="settings.hide_widget_summary">Hide widget after exiting app</string>

+	<string name="settings.podcasts_enabled">Podcasts Enabled</string>

+	<string name="settings.podcasts_enabled_summary">Whether or not to display the podcast listing in the pull out drawer</string>

+	<string name="settings.bookmarks_enabled">Bookmarks Enabled</string>

+	<string name="settings.bookmarks_enabled_summary">Whether or not to display the bookmarks listing in the pull out drawer</string>

 	<string name="settings.sync_title">Sync</string>

 	<string name="settings.sync_enabled">Sync Enabled</string>

 	<string name="settings.sync_enabled_summary">Whether or not playlists or podcasts are periodically checked for changes</string>

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4dcce34f..b1475eb6 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -6,15 +6,15 @@
         <item name="android:padding">6dip</item>
         <item name="android:layout_marginLeft">4dip</item>
         <item name="android:layout_marginRight">4dip</item>
-        <item name="android:layout_width">54dip</item>
-        <item name="android:layout_height">54dip</item>
+        <item name="android:layout_width">@dimen/Button</item>
+        <item name="android:layout_height">@dimen/Button</item>
         <item name="android:contentDescription">@null</item>
     </style>
 	
 	<style name="PlaybackControl.Small" parent="@style/PlaybackControl">
 		<item name="android:padding">4dip</item>
-        <item name="android:layout_width">46dip</item>
-        <item name="android:layout_height">46dip</item>
+        <item name="android:layout_width">@dimen/Button.Small</item>
+        <item name="android:layout_height">@dimen/Button.Small</item>
     </style>
 	
 	<style name="MenuBarButton">
@@ -27,6 +27,28 @@
 		<item name="android:textColor">?android:textColorPrimary</item>
     </style>
 
+	<style name="DownloadActionButton">
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:textStyle">bold</item>
+		<item name="android:textSize">22sp</item>
+		<item name="android:background">@drawable/menubar_button</item>
+		<item name="android:paddingTop">4dip</item>
+		<item name="android:paddingBottom">4dip</item>
+		<item name="android:paddingRight">4dip</item>
+		<item name="android:paddingLeft">4dip</item>
+	</style>
+
+	<style name="DownloadActionImageButton">
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:background">@drawable/menubar_button</item>
+		<item name="android:paddingTop">8dip</item>
+		<item name="android:paddingBottom">8dip</item>
+		<item name="android:paddingRight">16dip</item>
+		<item name="android:paddingLeft">16dip</item>
+	</style>
+
 	<style name="DragDropListView">
 		<item name="drag_enabled">true</item>
 		<item name="collapsed_height">1dp</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index b2aa8277..1b2078a7 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -10,22 +10,48 @@
 		<item name="media_button_repeat_off">@drawable/media_repeat_off_light</item>
 		<item name="media_button_start">@drawable/media_start_light</item>
 		<item name="media_button_stop">@drawable/media_stop_light</item>
-		<item name="chat">@drawable/ic_menu_chat_light</item> 
-		<item name="chat_send">@drawable/ic_menu_chat_send_light</item> 
+		<item name="chat_send">@drawable/ic_menu_chat_send_light</item>
+		<item name="download_none">@drawable/download_none_light</item>
+		<item name="shuffle">@drawable/ic_menu_shuffle_light</item>
+		<item name="refresh">@drawable/ic_menu_refresh_light</item>
+		<item name="search">@drawable/ic_menu_search_light</item>
+		<item name="remove">@drawable/ic_menu_remove_light</item>
+		<item name="save">@drawable/ic_menu_save_light</item>
+		<item name="volume">@drawable/ic_action_volume_light</item>
+		<item name="toggle_list">@drawable/action_toggle_list_light</item>
+		<item name="select_server">@drawable/main_select_server_light</item>
+		<item name="downloading">@drawable/downloading_light</item>
+		<item name="bookmark">@drawable/ic_menu_bookmark_light</item>
+		<item name="drawerItemsIcons">@array/drawerItemIconsLight</item>
+		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
+		<item name="android:buttonStyle">@style/DSub.ButtonStyle</item>
 	</style>
 	<style name="Theme.DSub.Dark" parent="@style/Theme.AppCompat">
 		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item>
 		<item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item>
 		<item name="android:textColorSecondary">@color/cyan</item>
-		<item name="offline_icon">@drawable/main_offline</item>
-		<item name="media_button_backward">@drawable/media_backward</item>
-		<item name="media_button_forward">@drawable/media_forward</item>
-		<item name="media_button_pause">@drawable/media_pause</item>
+		<item name="offline_icon">@drawable/main_offline_dark</item>
+		<item name="media_button_backward">@drawable/media_backward_dark</item>
+		<item name="media_button_forward">@drawable/media_forward_dark</item>
+		<item name="media_button_pause">@drawable/media_pause_dark</item>
 		<item name="media_button_repeat_off">@drawable/media_repeat_off</item>
-		<item name="media_button_start">@drawable/media_start</item>
-		<item name="media_button_stop">@drawable/media_stop</item>
-		<item name="chat">@drawable/ic_menu_chat_dark</item> 
-		<item name="chat_send">@drawable/ic_menu_chat_send_dark</item> 
+		<item name="media_button_start">@drawable/media_start_dark</item>
+		<item name="media_button_stop">@drawable/media_stop_dark</item>
+		<item name="chat_send">@drawable/ic_menu_chat_send_dark</item>
+		<item name="download_none">@drawable/download_none_dark</item>
+		<item name="shuffle">@drawable/ic_menu_shuffle_dark</item>
+		<item name="refresh">@drawable/ic_menu_refresh_dark</item>
+		<item name="search">@drawable/ic_menu_search_dark</item>
+		<item name="remove">@drawable/ic_menu_remove_dark</item>
+		<item name="save">@drawable/ic_menu_save_dark</item>
+		<item name="volume">@drawable/ic_action_volume_dark</item>
+		<item name="toggle_list">@drawable/action_toggle_list_dark</item>
+		<item name="select_server">@drawable/main_select_server_dark</item>
+		<item name="downloading">@drawable/downloading_dark</item>
+		<item name="bookmark">@drawable/ic_menu_bookmark_dark</item>
+		<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
+		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
+		<item name="android:buttonStyle">@style/DSub.ButtonStyle</item>
 	</style>
 	<style name="Theme.DSub.Black" parent="Theme.DSub.Dark">
 		<item name="android:windowBackground">@android:color/black</item>
@@ -33,17 +59,29 @@
 	<style name="Theme.DSub.Holo" parent="@style/Theme.AppCompat">
 		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Holo</item>
 		<item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Holo</item>
-		<item name="android:textColorSecondary">@color/cyan</item>
 		<item name="android:windowBackground">@drawable/background</item>
-		<item name="offline_icon">@drawable/main_offline</item>
-		<item name="media_button_backward">@drawable/media_backward</item>
-		<item name="media_button_forward">@drawable/media_forward</item>
-		<item name="media_button_pause">@drawable/media_pause</item>
+		<item name="offline_icon">@drawable/main_offline_dark</item>
+		<item name="media_button_backward">@drawable/media_backward_dark</item>
+		<item name="media_button_forward">@drawable/media_forward_dark</item>
+		<item name="media_button_pause">@drawable/media_pause_dark</item>
 		<item name="media_button_repeat_off">@drawable/media_repeat_off</item>
-		<item name="media_button_start">@drawable/media_start</item>
-		<item name="media_button_stop">@drawable/media_stop</item>
-		<item name="chat">@drawable/ic_menu_chat_dark</item> 
+		<item name="media_button_start">@drawable/media_start_dark</item>
+		<item name="media_button_stop">@drawable/media_stop_dark</item>
 		<item name="chat_send">@drawable/ic_menu_chat_send_dark</item>
+		<item name="download_none">@drawable/download_none_dark</item>
+		<item name="shuffle">@drawable/ic_menu_shuffle_dark</item>
+		<item name="refresh">@drawable/ic_menu_refresh_dark</item>
+		<item name="search">@drawable/ic_menu_search_dark</item>
+		<item name="remove">@drawable/ic_menu_remove_dark</item>
+		<item name="save">@drawable/ic_menu_save_dark</item>
+		<item name="volume">@drawable/ic_action_volume_dark</item>
+		<item name="toggle_list">@drawable/action_toggle_list_dark</item>
+		<item name="select_server">@drawable/main_select_server_dark</item>
+		<item name="downloading">@drawable/downloading_dark</item>
+		<item name="bookmark">@drawable/ic_menu_bookmark_dark</item>
+		<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
+		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
+		<item name="android:buttonStyle">@style/DSub.ButtonStyle</item>
 	</style>
 	
 	<style name="Theme.DSub.Light.Fullscreen" parent="Theme.DSub.Light">
@@ -79,4 +117,10 @@
 		<item name="backgroundStacked">@android:color/transparent</item>
 		<item name="android:backgroundStacked">@android:color/transparent</item>
 	</style>
+
+	<style name="DSub.TextViewStyle" parent="android:Widget.TextView">
+	</style>
+
+	<style name="DSub.ButtonStyle" parent="android:Widget.Holo.Button">
+	</style>
 </resources>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index feb7a81e..6f7527ab 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -1,232 +1,279 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:title="@string/settings.title">
+	android:title="@string/settings.title">
 
-    <PreferenceCategory
+    <PreferenceScreen
+		android:title="@string/settings.servers_title">
+
+		<PreferenceCategory
 			android:key="server"
-            android:title="@string/settings.servers_title">
-
-		<Preference
-                android:key="serverAdd"
-                android:title="@string/settings.servers_add"/>
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-            android:title="@string/settings.appearance_title">
-
-        <ListPreference
-                android:title="@string/settings.theme_title"
-                android:key="theme"
-                android:defaultValue="holo"
-                android:entryValues="@array/themeValues"
-                android:entries="@array/themeNames"/>
-
-		<CheckBoxPreference
-			android:title="@string/settings.track_title"
-			android:summary="@string/settings.track_summary"
-			android:key="displayTrack"
-			android:defaultValue="false"/>
-
-    </PreferenceCategory>
-
-	<PreferenceCategory
-		android:title="@string/settings.video_title">
-
-		<ListPreference
-			android:title="@string/settings.video_player"
-			android:key="videoPlayer"
-			android:defaultValue="raw"
-			android:entryValues="@array/videoPlayerValues"
-			android:entries="@array/videoPlayerNames"/>
-	</PreferenceCategory>
-
-    <PreferenceCategory
-            android:title="@string/settings.network_title">
-
-        <ListPreference
-                android:title="@string/settings.max_bitrate_wifi"
-                android:key="maxBitrateWifi"
-                android:defaultValue="0"
-                android:entryValues="@array/maxBitrateValues"
-                android:entries="@array/maxBitrateNames"/>
-
-        <ListPreference
-                android:title="@string/settings.max_bitrate_mobile"
-                android:key="maxBitrateMobile"
-                android:defaultValue="0"
-                android:entryValues="@array/maxBitrateValues"
-                android:entries="@array/maxBitrateNames"/>
-				
-		<ListPreference
-			android:title="@string/settings.max_video_bitrate_wifi"
-			android:key="maxVideoBitrateWifi"
-			android:defaultValue="0"
-			android:entryValues="@array/maxVideoBitrateValues"
-			android:entries="@array/maxVideoBitrateNames"/>
-
-		<ListPreference
-			android:title="@string/settings.max_video_bitrate_mobile"
-			android:key="maxVideoBitrateMobile"
-			android:defaultValue="0"
-			android:entryValues="@array/maxVideoBitrateValues"
-			android:entries="@array/maxVideoBitrateNames"/>
-
-        <CheckBoxPreference
-                android:title="@string/settings.wifi_required_title"
-                android:summary="@string/settings.wifi_required_summary"
-                android:key="wifiRequiredForDownload"
-                android:defaultValue="false"/>
-				
-		<ListPreference
-			android:title="@string/settings.network_timeout_title"
-			android:key="networkTimeout"
-			android:defaultValue="15000"
-			android:entryValues="@array/networkTimeoutValues"
-			android:entries="@array/networkTimeoutNames"/>
-
-    </PreferenceCategory>
-	
-	<PreferenceCategory
-            android:title="@string/settings.playlist_title">
+			android:title="@string/settings.servers_title">
+
+			<Preference
+				android:key="serverAdd"
+				android:order="1000000"
+				android:title="@string/settings.servers_add"/>
+		</PreferenceCategory>
+
+    </PreferenceScreen>
+
+	<PreferenceScreen
+		android:title="@string/settings.appearance_title">
+
+		<PreferenceCategory
+				android:title="@string/settings.appearance_title">
+
+			<ListPreference
+				android:title="@string/settings.theme_title"
+				android:key="theme"
+				android:defaultValue="holo"
+				android:entryValues="@array/themeValues"
+				android:entries="@array/themeNames"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.track_title"
+				android:summary="@string/settings.track_summary"
+				android:key="displayTrack"
+				android:defaultValue="false"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.hide_widget_title"
+				android:summary="@string/settings.hide_widget_summary"
+				android:key="hideWidget"
+				android:defaultValue="false"/>
+
+		</PreferenceCategory>
+
+		<PreferenceCategory
+			android:title="@string/button_bar.chat">
+
+			<CheckBoxPreference
+				android:title="@string/settings.chat_enabled"
+				android:summary="@string/settings.chat_enabled_summary"
+				android:key="chatEnabled"
+				android:defaultValue="true"/>
 
 			<EditTextPreference
-                android:title="@string/settings.buffer_length"
-                android:key="bufferLength"
-                android:defaultValue="5"
-				android:digits="0123456789"/>
-				
-			<EditTextPreference
-                android:title="@string/settings.playlist_random_size_title"
-                android:key="randomSize"
-                android:defaultValue="20"
+				android:title="@string/settings.chat_refresh"
+				android:key="chatRefreshRate"
+				android:defaultValue="30"
 				android:digits="0123456789"/>
-				
+		</PreferenceCategory>
+
+		<PreferenceCategory
+			android:title="@string/settings.other_title">
+
+			<CheckBoxPreference
+				android:title="@string/settings.podcasts_enabled"
+				android:summary="@string/settings.podcasts_enabled_summary"
+				android:key="podcastsEnabled"
+				android:defaultValue="true"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.bookmarks_enabled"
+				android:summary="@string/settings.bookmarks_enabled_summary"
+				android:key="bookmarksEnabled"
+				android:defaultValue="true"/>
+		</PreferenceCategory>
+	</PreferenceScreen>
+
+	<PreferenceScreen
+		android:title="@string/settings.cache_screen_title">
+
+		<PreferenceCategory
+				android:title="@string/settings.network_title">
+
+			<ListPreference
+				android:title="@string/settings.max_bitrate_wifi"
+				android:key="maxBitrateWifi"
+				android:defaultValue="0"
+				android:entryValues="@array/maxBitrateValues"
+				android:entries="@array/maxBitrateNames"/>
+
+			<ListPreference
+				android:title="@string/settings.max_bitrate_mobile"
+				android:key="maxBitrateMobile"
+				android:defaultValue="0"
+				android:entryValues="@array/maxBitrateValues"
+				android:entries="@array/maxBitrateNames"/>
+
+			<ListPreference
+				android:title="@string/settings.max_video_bitrate_wifi"
+				android:key="maxVideoBitrateWifi"
+				android:defaultValue="0"
+				android:entryValues="@array/maxVideoBitrateValues"
+				android:entries="@array/maxVideoBitrateNames"/>
+
 			<ListPreference
-				android:title="@string/settings.temp_loss_title"
-				android:key="tempLoss"
-				android:defaultValue="1"
-				android:entryValues="@array/tempLossValues"
-				android:entries="@array/tempLossNames"/>
+				android:title="@string/settings.max_video_bitrate_mobile"
+				android:key="maxVideoBitrateMobile"
+				android:defaultValue="0"
+				android:entryValues="@array/maxVideoBitrateValues"
+				android:entries="@array/maxVideoBitrateNames"/>
 
 			<CheckBoxPreference
-                android:title="@string/settings.persistent_title"
-                android:summary="@string/settings.persistent_summary"
-                android:key="persistentNotification"
-                android:defaultValue="false"/>
-	</PreferenceCategory>
-	
-	<PreferenceCategory
-            android:title="@string/settings.cache_title">
-
-        <EditTextPreference
-                android:title="@string/settings.cache_size"
-                android:key="cacheSize"
-                android:defaultValue="2000"
+				android:title="@string/settings.wifi_required_title"
+				android:summary="@string/settings.wifi_required_summary"
+				android:key="wifiRequiredForDownload"
+				android:defaultValue="false"/>
+
+			<ListPreference
+				android:title="@string/settings.network_timeout_title"
+				android:key="networkTimeout"
+				android:defaultValue="15000"
+				android:entryValues="@array/networkTimeoutValues"
+				android:entries="@array/networkTimeoutNames"/>
+		</PreferenceCategory>
+
+		<PreferenceCategory
+			android:title="@string/settings.cache_title">
+
+			<EditTextPreference
+				android:title="@string/settings.cache_size"
+				android:key="cacheSize"
+				android:defaultValue="2000"
 				android:digits="0123456789"/>
 
-        <EditTextPreference
-                android:title="@string/settings.cache_location"
-                android:key="cacheLocation"/>
-
-        <ListPreference
-                android:title="@string/settings.preload_wifi"
-                android:key="preloadCountWifi"
-                android:defaultValue="3"
-                android:entryValues="@array/preloadCountValues"
-                android:entries="@array/preloadCountNames"/>
-
-		<ListPreference
-                android:title="@string/settings.preload_mobile"
-                android:key="preloadCountMobile"
-                android:defaultValue="3"
-                android:entryValues="@array/preloadCountValues"
-                android:entries="@array/preloadCountNames"/>
-
-		<Preference
+			<EditTextPreference
+				android:title="@string/settings.cache_location"
+				android:key="cacheLocation"/>
+
+			<ListPreference
+				android:title="@string/settings.preload_wifi"
+				android:key="preloadCountWifi"
+				android:defaultValue="3"
+				android:entryValues="@array/preloadCountValues"
+				android:entries="@array/preloadCountNames"/>
+
+			<ListPreference
+				android:title="@string/settings.preload_mobile"
+				android:key="preloadCountMobile"
+				android:defaultValue="3"
+				android:entryValues="@array/preloadCountValues"
+				android:entries="@array/preloadCountNames"/>
+
+			<Preference
 				android:key="clearCache"
 				android:title="@string/settings.cache_clear"
 				android:persistent="false"/>
-    </PreferenceCategory>
-
-	<PreferenceCategory
-		android:title="@string/settings.sync_title">
-
-		<CheckBoxPreference
-			android:title="@string/settings.sync_enabled"
-			android:summary="@string/settings.sync_enabled_summary"
-			android:key="syncEnabled"
-			android:defaultValue="true"/>
-
-		<ListPreference
-			android:title="@string/settings.sync_interval"
-			android:key="syncInterval"
-			android:defaultValue="60"
-			android:entryValues="@array/syncIntervalValues"
-			android:entries="@array/syncIntervalNames"/>
-
-		<CheckBoxPreference
-			android:title="@string/settings.sync_wifi"
-			android:summary="@string/settings.sync_wifi_summary"
-			android:key="syncWifi"
-			android:defaultValue="true"/>
-	</PreferenceCategory>
-
-	<PreferenceCategory
-		android:title="@string/button_bar.chat">
-
-		<CheckBoxPreference
-                android:title="@string/settings.chat_enabled"
-                android:summary="@string/settings.chat_enabled_summary"
-                android:key="chatEnabled"
-                android:defaultValue="true"/>
-		
-		<EditTextPreference
-                android:title="@string/settings.chat_refresh"
-                android:key="chatRefreshRate"
-                android:defaultValue="30"
-				android:digits="0123456789"/>
-	</PreferenceCategory>
-
-    <PreferenceCategory
-            android:title="@string/settings.other_title">
-
-        <CheckBoxPreference
-                android:title="@string/settings.scrobble_title"
-                android:summary="@string/settings.scrobble_summary"
-                android:key="scrobble"
-                android:defaultValue="false"/>
-
-        <CheckBoxPreference
-                android:title="@string/settings.hide_media_title"
-                android:summary="@string/settings.hide_media_summary"
-                android:key="hideMedia"
-                android:defaultValue="false"/>
-
-        <CheckBoxPreference
-                android:title="@string/settings.media_button_title"
-                android:summary="@string/settings.media_button_summary"
-                android:key="mediaButtons"
-                android:defaultValue="true"/>
-
-        <CheckBoxPreference
-                android:title="@string/settings.screen_lit_title"
-                android:summary="@string/settings.screen_lit_summary"
-                android:key="screenLitOnDownload"
-                android:defaultValue="true"/>
-
-		<CheckBoxPreference
-			android:title="@string/settings.gapless_playback"
-			android:summary="@string/settings.gapless_playback_summary"
-			android:key="gaplessPlayback"
-			android:defaultValue="true"/>
-
-        <Preference
-                android:key="clearSearchHistory"
-                android:title="@string/settings.clear_search_history"
-                android:persistent="false"/>
-
-    </PreferenceCategory>
+		</PreferenceCategory>
+
+		<PreferenceCategory
+			android:title="@string/settings.sync_title">
+
+			<CheckBoxPreference
+				android:title="@string/settings.sync_enabled"
+				android:summary="@string/settings.sync_enabled_summary"
+				android:key="syncEnabled"
+				android:defaultValue="true"/>
+
+			<ListPreference
+				android:title="@string/settings.sync_interval"
+				android:key="syncInterval"
+				android:defaultValue="60"
+				android:entryValues="@array/syncIntervalValues"
+				android:entries="@array/syncIntervalNames"/>
 
+			<CheckBoxPreference
+				android:title="@string/settings.sync_wifi"
+				android:summary="@string/settings.sync_wifi_summary"
+				android:key="syncWifi"
+				android:defaultValue="true"/>
+		</PreferenceCategory>
+
+		<PreferenceCategory
+			android:title="@string/settings.other_title">
+
+			<CheckBoxPreference
+				android:title="@string/settings.hide_media_title"
+				android:summary="@string/settings.hide_media_summary"
+				android:key="hideMedia"
+				android:defaultValue="false"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.screen_lit_title"
+				android:summary="@string/settings.screen_lit_summary"
+				android:key="screenLitOnDownload"
+				android:defaultValue="true"/>
+
+			<Preference
+				android:key="clearSearchHistory"
+				android:title="@string/settings.clear_search_history"
+				android:persistent="false"/>
+		</PreferenceCategory>
+	</PreferenceScreen>
+
+	<PreferenceScreen
+		android:title="@string/settings.playback_title">
+
+		<PreferenceCategory
+				android:title="@string/settings.playback_title">
+
+				<EditTextPreference
+					android:title="@string/settings.buffer_length"
+					android:key="bufferLength"
+					android:defaultValue="5"
+					android:digits="0123456789"/>
+
+				<EditTextPreference
+					android:title="@string/settings.playlist_random_size_title"
+					android:key="randomSize"
+					android:defaultValue="20"
+					android:digits="0123456789"/>
+
+				<ListPreference
+					android:title="@string/settings.temp_loss_title"
+					android:key="tempLoss"
+					android:defaultValue="1"
+					android:entryValues="@array/tempLossValues"
+					android:entries="@array/tempLossNames"/>
+
+				<ListPreference
+					android:title="@string/settings.disconnect_pause_title"
+					android:key="pauseOnDisconnect"
+					android:defaultValue="0"
+					android:entryValues="@array/disconnectPauseValues"
+					android:entries="@array/disconnectPauseNames"/>
+
+				<CheckBoxPreference
+					android:title="@string/settings.persistent_title"
+					android:summary="@string/settings.persistent_summary"
+					android:key="persistentNotification"
+					android:defaultValue="false"/>
+		</PreferenceCategory>
+
+		<PreferenceCategory
+			android:title="@string/settings.video_title">
+
+			<ListPreference
+				android:title="@string/settings.video_player"
+				android:key="videoPlayer"
+				android:defaultValue="raw"
+				android:entryValues="@array/videoPlayerValues"
+				android:entries="@array/videoPlayerNames"/>
+		</PreferenceCategory>
+
+		<PreferenceCategory
+			android:title="@string/settings.other_title">
+
+			<CheckBoxPreference
+				android:title="@string/settings.scrobble_title"
+				android:summary="@string/settings.scrobble_summary"
+				android:key="scrobble"
+				android:defaultValue="false"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.media_button_title"
+				android:summary="@string/settings.media_button_summary"
+				android:key="mediaButtons"
+				android:defaultValue="true"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.gapless_playback"
+				android:summary="@string/settings.gapless_playback_summary"
+				android:key="gaplessPlayback"
+				android:defaultValue="true"/>
+		</PreferenceCategory>
+	</PreferenceScreen>
 </PreferenceScreen>