Converted everything to ActionBarCompat

33 files changed, 111 insertions, 79 deletions

diff --git a/res/menu/chat.xml b/res/menu/chat.xml
index e0f9a718..685aba18 100644
--- a/res/menu/chat.xml
+++ b/res/menu/chat.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">		
+<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"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 
 	<item 
 		android:id="@+id/menu_settings"
diff --git a/res/menu/empty.xml b/res/menu/empty.xml
index b6db96aa..979eefe4 100644
--- a/res/menu/empty.xml
+++ b/res/menu/empty.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<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"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 </menu>
diff --git a/res/menu/main.xml b/res/menu/main.xml
index c9420236..1390b68b 100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_search"
 		android:icon="@drawable/action_search"
 		android:title="@string/menu.search"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 	
 	<item 
 		android:id="@+id/menu_shuffle"
 		android:icon="@drawable/action_shuffle"
 		android:title="@string/menu.shuffle"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 
 	<item 
 		android:id="@+id/menu_help"
diff --git a/res/menu/nowplaying.xml b/res/menu/nowplaying.xml
index 572c5bac..ae411240 100644
--- a/res/menu/nowplaying.xml
+++ b/res/menu/nowplaying.xml
@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	  xmlns:compat="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/menu_shuffle"
         android:icon="@drawable/action_shuffle"
         android:title="@string/download.menu_shuffle"
-        android:showAsAction="ifRoom|withText"/>
+        compat:showAsAction="ifRoom|withText"/>
 		
 	<item
         android:id="@+id/menu_remove_all"
         android:icon="@drawable/action_remove_all"
         android:title="@string/download.menu_remove_all"
-        android:showAsAction="ifRoom|withText"/>
+        compat:showAsAction="ifRoom|withText"/>
 
     <item
         android:id="@+id/menu_save_playlist"
         android:icon="@drawable/action_save"
         android:title="@string/download.menu_save"
-        android:showAsAction="ifRoom|withText"/>
+        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"
-        android:showAsAction="ifRoom|withText"/>
+        compat:showAsAction="ifRoom|withText"/>
 		
 	<item
         android:id="@+id/menu_toggle_timer"
diff --git a/res/menu/nowplaying_context.xml b/res/menu/nowplaying_context.xml
index f42c3644..405b8e51 100644
--- a/res/menu/nowplaying_context.xml
+++ b/res/menu/nowplaying_context.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item
 		android:id="@+id/menu_info"
 		android:title="@string/common.info"
diff --git a/res/menu/nowplaying_context_offline.xml b/res/menu/nowplaying_context_offline.xml
index 1446353f..77f94bb6 100644
--- a/res/menu/nowplaying_context_offline.xml
+++ b/res/menu/nowplaying_context_offline.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item
 		android:id="@+id/menu_info"
 		android:title="@string/common.info"
diff --git a/res/menu/nowplaying_downloading.xml b/res/menu/nowplaying_downloading.xml
index 9376731a..fbdb78f4 100644
--- a/res/menu/nowplaying_downloading.xml
+++ b/res/menu/nowplaying_downloading.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">		
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item
         android:id="@+id/menu_remove_all"
         android:icon="@drawable/action_remove_all"
         android:title="@string/download.menu_remove_all"
-        android:showAsAction="always|withText"/>
+        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"
-        android:showAsAction="ifRoom|withText"/>
+        compat:showAsAction="ifRoom|withText"/>
 		
 	<item
         android:id="@+id/menu_toggle_timer"
diff --git a/res/menu/nowplaying_offline.xml b/res/menu/nowplaying_offline.xml
index e3e85040..3800c013 100644
--- a/res/menu/nowplaying_offline.xml
+++ b/res/menu/nowplaying_offline.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/menu_shuffle"
         android:icon="@drawable/action_shuffle"
         android:title="@string/download.menu_shuffle"
-        android:showAsAction="always|withText"/>
+        compat:showAsAction="always|withText"/>
 		
 	<item
         android:id="@+id/menu_remove_all"
         android:icon="@drawable/action_remove_all"
         android:title="@string/download.menu_remove_all"
-        android:showAsAction="always|withText"/>
+        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"
-        android:showAsAction="ifRoom|withText"/>
+        compat:showAsAction="ifRoom|withText"/>
 		
 	<item
         android:id="@+id/menu_toggle_timer"
diff --git a/res/menu/search.xml b/res/menu/search.xml
index b9cdecac..fa361566 100644
--- a/res/menu/search.xml
+++ b/res/menu/search.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_search"
 		android:icon="@drawable/action_search"
 		android:title="@string/menu.search"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 
 	<item 
 		android:id="@+id/menu_help"
diff --git a/res/menu/select_album.xml b/res/menu/select_album.xml
index 5ca9c537..329c479c 100644
--- a/res/menu/select_album.xml
+++ b/res/menu/select_album.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">		
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_play_now"
 		android:icon="@drawable/action_play_all"
 		android:title="@string/menu.play"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_refresh"
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_shuffle"
 		android:icon="@drawable/action_shuffle"
 		android:title="@string/menu.shuffle"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 </menu>
diff --git a/res/menu/select_album_context.xml b/res/menu/select_album_context.xml
index 00fe7993..efc2f2fd 100644
--- a/res/menu/select_album_context.xml
+++ b/res/menu/select_album_context.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 
     <item 
         android:id="@+id/album_menu_play_now"
diff --git a/res/menu/select_album_context_offline.xml b/res/menu/select_album_context_offline.xml
index 70cf9da9..d40466fd 100644
--- a/res/menu/select_album_context_offline.xml
+++ b/res/menu/select_album_context_offline.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
     <item 
         android:id="@+id/album_menu_play_now"
         android:title="@string/common.play_now"
diff --git a/res/menu/select_album_list.xml b/res/menu/select_album_list.xml
index b6db96aa..635a36bf 100644
--- a/res/menu/select_album_list.xml
+++ b/res/menu/select_album_list.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<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"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 </menu>
diff --git a/res/menu/select_artist.xml b/res/menu/select_artist.xml
index a7b988a5..3c694cd2 100644
--- a/res/menu/select_artist.xml
+++ b/res/menu/select_artist.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">		
+<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"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_shuffle"
 		android:icon="@drawable/action_shuffle"
 		android:title="@string/menu.shuffle"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_search"
 		android:icon="@drawable/action_search"
 		android:title="@string/menu.search"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 
 	<item 
 		android:id="@+id/menu_settings"
diff --git a/res/menu/select_artist_context.xml b/res/menu/select_artist_context.xml
index 23d64c4e..d7a5c6ac 100644
--- a/res/menu/select_artist_context.xml
+++ b/res/menu/select_artist_context.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 
     <item 
         android:id="@+id/artist_menu_play_now"
diff --git a/res/menu/select_artist_context_offline.xml b/res/menu/select_artist_context_offline.xml
index c80db020..72d99cd5 100644
--- a/res/menu/select_artist_context_offline.xml
+++ b/res/menu/select_artist_context_offline.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 
     <item 
         android:id="@+id/artist_menu_play_now"
diff --git a/res/menu/select_genres.xml b/res/menu/select_genres.xml
index e0f9a718..7ce7f1a0 100644
--- a/res/menu/select_genres.xml
+++ b/res/menu/select_genres.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">		
+<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"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 
 	<item 
 		android:id="@+id/menu_settings"
diff --git a/res/menu/select_playlist.xml b/res/menu/select_playlist.xml
index a68e6da0..4c4cc302 100644
--- a/res/menu/select_playlist.xml
+++ b/res/menu/select_playlist.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">		
+<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"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_search"
 		android:icon="@drawable/action_search"
 		android:title="@string/menu.search"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 
 	<item 
 		android:id="@+id/menu_settings"
diff --git a/res/menu/select_playlist_context.xml b/res/menu/select_playlist_context.xml
index 6d844a16..0ec94e02 100644
--- a/res/menu/select_playlist_context.xml
+++ b/res/menu/select_playlist_context.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	
 	<item
 		android:id="@+id/playlist_info"
diff --git a/res/menu/select_playlist_context_offline.xml b/res/menu/select_playlist_context_offline.xml
index 644df2d3..d63aec17 100644
--- a/res/menu/select_playlist_context_offline.xml
+++ b/res/menu/select_playlist_context_offline.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
     <item 
         android:id="@+id/playlist_menu_play_now"
         android:title="@string/common.play_now"
diff --git a/res/menu/select_podcast_episode.xml b/res/menu/select_podcast_episode.xml
index 7cd1ec88..7e79d0f7 100644
--- a/res/menu/select_podcast_episode.xml
+++ b/res/menu/select_podcast_episode.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<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"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item
 		android:id="@+id/menu_download_all"
diff --git a/res/menu/select_podcast_episode_context.xml b/res/menu/select_podcast_episode_context.xml
index 25c83989..deffdecf 100644
--- a/res/menu/select_podcast_episode_context.xml
+++ b/res/menu/select_podcast_episode_context.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	
 	<item
 		android:id="@+id/song_menu_info"
diff --git a/res/menu/select_podcast_episode_context_offline.xml b/res/menu/select_podcast_episode_context_offline.xml
index 38c4569b..8d1508ac 100644
--- a/res/menu/select_podcast_episode_context_offline.xml
+++ b/res/menu/select_podcast_episode_context_offline.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	
 	<item
 		android:id="@+id/song_menu_info"
diff --git a/res/menu/select_podcast_episode_offline.xml b/res/menu/select_podcast_episode_offline.xml
index 9bbc2d92..cb6d1a3b 100644
--- a/res/menu/select_podcast_episode_offline.xml
+++ b/res/menu/select_podcast_episode_offline.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<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"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_delete"
diff --git a/res/menu/select_podcasts.xml b/res/menu/select_podcasts.xml
index e77b43db..6c1ffa07 100644
--- a/res/menu/select_podcasts.xml
+++ b/res/menu/select_podcasts.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">		
+<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"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 
 	<item 
 		android:id="@+id/menu_add_podcast"
diff --git a/res/menu/select_podcasts_context.xml b/res/menu/select_podcasts_context.xml
index af4edb55..c9785b92 100644
--- a/res/menu/select_podcasts_context.xml
+++ b/res/menu/select_podcasts_context.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<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"/>
diff --git a/res/menu/select_song.xml b/res/menu/select_song.xml
index 3a55fee0..658e3ffe 100644
--- a/res/menu/select_song.xml
+++ b/res/menu/select_song.xml
@@ -1,46 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">		
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_play_now"
 		android:icon="@drawable/action_play_all"
 		android:title="@string/menu.play"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_refresh"
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_shuffle"
 		android:icon="@drawable/action_shuffle"
 		android:title="@string/menu.shuffle"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 		
 	<item 
 		android:id="@+id/menu_select"
 		android:icon="@drawable/action_select"
 		android:title="@string/menu.select"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 		
 	<item 
 		android:id="@+id/menu_download"
 		android:icon="@drawable/action_save"
 		android:title="@string/common.download"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 		
 	<item 
 		android:id="@+id/menu_cache"
 		android:icon="@drawable/action_save"
 		android:title="@string/common.pin"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 		
 	<item 
 		android:id="@+id/menu_delete"
 		android:icon="@drawable/action_remove_all"
 		android:title="@string/common.delete"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 	
 	<item 
 		android:id="@+id/menu_add_playlist"
@@ -54,5 +55,5 @@
 		android:id="@+id/menu_play_last"
 		android:icon="@drawable/action_play_all"
 		android:title="@string/menu.play_last"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 </menu>
diff --git a/res/menu/select_song_context.xml b/res/menu/select_song_context.xml
index 4db229f2..e2048b20 100644
--- a/res/menu/select_song_context.xml
+++ b/res/menu/select_song_context.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	
 	<item
 		android:id="@+id/song_menu_info"
diff --git a/res/menu/select_song_context_offline.xml b/res/menu/select_song_context_offline.xml
index d19eaa70..36a0c1ff 100644
--- a/res/menu/select_song_context_offline.xml
+++ b/res/menu/select_song_context_offline.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	
 	<item
 		android:id="@+id/song_menu_info"
diff --git a/res/menu/select_song_offline.xml b/res/menu/select_song_offline.xml
index 6ed43b71..7588d9ad 100644
--- a/res/menu/select_song_offline.xml
+++ b/res/menu/select_song_offline.xml
@@ -1,38 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">		
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_play_now"
 		android:icon="@drawable/action_play_all"
 		android:title="@string/menu.play"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_refresh"
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_shuffle"
 		android:icon="@drawable/action_shuffle"
 		android:title="@string/menu.shuffle"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 		
 	<item 
 		android:id="@+id/menu_select"
 		android:icon="@drawable/action_select"
 		android:title="@string/menu.select"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 		
 	<item 
 		android:id="@+id/menu_delete"
 		android:icon="@drawable/action_remove_all"
 		android:title="@string/common.delete"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 		
 	<item 
 		android:id="@+id/menu_play_last"
 		android:icon="@drawable/action_play_all"
 		android:title="@string/menu.play_last"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 </menu>
diff --git a/res/menu/select_video_context.xml b/res/menu/select_video_context.xml
index 5926f8a5..084c29aa 100644
--- a/res/menu/select_video_context.xml
+++ b/res/menu/select_video_context.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item
 		android:id="@+id/song_menu_info"
 		android:title="@string/common.info"/>
diff --git a/res/menu/select_video_context_offline.xml b/res/menu/select_video_context_offline.xml
index fc354119..7a9020f5 100644
--- a/res/menu/select_video_context_offline.xml
+++ b/res/menu/select_video_context_offline.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item
 		android:id="@+id/song_menu_info"
 		android:title="@string/common.info"/>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 33dd2de7..a32a34e8 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<style name="Theme.DSub.Light" parent="Theme.Sherlock.Light">
+	<style name="Theme.DSub.Light" parent="@style/Theme.AppCompat.Light">
 		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Light</item>
 		<item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Light</item>
 		<item name="offline_icon">@drawable/main_offline_light</item>
@@ -13,7 +13,7 @@
 		<item name="chat">@drawable/ic_menu_chat_light</item> 
 		<item name="chat_send">@drawable/ic_menu_chat_send_light</item> 
 	</style>
-	<style name="Theme.DSub.Dark" parent="Theme.Sherlock">
+	<style name="Theme.DSub.Dark" parent="@style/Theme.AppCompat.Light.DarkActionBar">
 		<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>
@@ -30,7 +30,7 @@
 	<style name="Theme.DSub.Black" parent="Theme.DSub.Dark">
 		<item name="android:windowBackground">@android:color/black</item>
 	</style>
-	<style name="Theme.DSub.Holo" parent="Theme.Sherlock">
+	<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>
@@ -59,21 +59,21 @@
 		<item name="android:windowFullscreen">true</item>
 	</style>
 	
-	<style name="Widget.DSub.ActionBarStyle.Light" parent="Widget.Sherlock.Light.ActionBar.Solid">
+	<style name="Widget.DSub.ActionBarStyle.Light" parent="Widget.AppCompat.Light.ActionBar.Solid">
 		<item name="background">@android:color/transparent</item>
 		<item name="android:background">@android:color/transparent</item>
 		<item name="backgroundStacked">@android:color/transparent</item>
 		<item name="android:backgroundStacked">@android:color/transparent</item>
 	</style>
 	
-	<style name="Widget.DSub.ActionBarStyle.Dark" parent="Widget.Sherlock.ActionBar.Solid">
+	<style name="Widget.DSub.ActionBarStyle.Dark" parent="Widget.AppCompat.ActionBar.Solid">
 		<item name="background">@android:color/transparent</item>
 		<item name="android:background">@android:color/transparent</item>
 		<item name="backgroundStacked">@android:color/transparent</item>
 		<item name="android:backgroundStacked">@android:color/transparent</item>
 	</style>
 	
-	<style name="Widget.DSub.ActionBarStyle.Holo" parent="Widget.Sherlock.ActionBar.Solid">
+	<style name="Widget.DSub.ActionBarStyle.Holo" parent="Widget.AppCompat.ActionBar.Solid">
 		<item name="background">@android:color/transparent</item>
 		<item name="android:background">@android:color/transparent</item>
 		<item name="backgroundStacked">@android:color/transparent</item>