Clean Up

gen/net/sourceforge/subsonic/androidapp/R.java

@@ -42,124 +42,106 @@ public final class R {
     }
     public static final class drawable {
         public static final int action_bar_bg=0x7f020000;
-        public static final int action_play_all=0x7f020001;
-        public static final int action_refresh=0x7f020002;
-        public static final int action_search=0x7f020003;
-        public static final int action_shuffle=0x7f020004;
-        public static final int actionbar_button_normal=0x7f020005;
-        public static final int actionbar_shadow=0x7f020006;
-        public static final int album_art_background=0x7f020007;
-        public static final int appwidget_art_default=0x7f020008;
-        public static final int appwidget_art_unknown=0x7f020009;
-        public static final int appwidget_bg=0x7f02000a;
-        public static final int appwidget_button_background=0x7f02000b;
-        public static final int appwidget_button_background_r=0x7f02000c;
-        public static final int appwidget_button_center=0x7f02000d;
-        public static final int appwidget_button_left=0x7f02000e;
-        public static final int appwidget_button_right=0x7f02000f;
-        public static final int appwidget_divider=0x7f020010;
-        public static final int appwidget_divider_horizontal=0x7f020011;
-        public static final int appwidget_divider_vertical=0x7f020012;
-        public static final int appwidget_inner_focus_c=0x7f020013;
-        public static final int appwidget_inner_focus_l=0x7f020014;
-        public static final int appwidget_inner_focus_r=0x7f020015;
-        public static final int appwidget_inner_press_c=0x7f020016;
-        public static final int appwidget_inner_press_l=0x7f020017;
-        public static final int appwidget_inner_press_r=0x7f020018;
-        public static final int appwidget_overlay=0x7f020019;
-        public static final int browse_offline=0x7f02001a;
-        public static final int btn_check_buttonless_off=0x7f02001b;
-        public static final int btn_check_buttonless_on=0x7f02001c;
-        public static final int btn_check_custom=0x7f02001d;
-        public static final int buttonbar_selector=0x7f02001e;
-        public static final int downloaded=0x7f02001f;
-        public static final int downloading=0x7f020020;
-        public static final int ic_appwidget_music_next=0x7f020021;
-        public static final int ic_appwidget_music_pause=0x7f020022;
-        public static final int ic_appwidget_music_play=0x7f020023;
-        public static final int ic_appwidget_music_previous=0x7f020024;
-        public static final int ic_launcher=0x7f020025;
-        public static final int ic_menu_compass=0x7f020026;
-        public static final int ic_menu_exit=0x7f020027;
-        public static final int ic_menu_help=0x7f020028;
-        public static final int ic_menu_moreoverflow=0x7f020029;
-        public static final int ic_menu_play_clip=0x7f02002a;
-        public static final int ic_menu_recent_history=0x7f02002b;
-        public static final int ic_menu_remove_all=0x7f02002c;
-        public static final int ic_menu_rotate=0x7f02002d;
-        public static final int ic_menu_save=0x7f02002e;
-        public static final int ic_menu_screen_on_off=0x7f02002f;
-        public static final int ic_menu_settings=0x7f020030;
-        public static final int ic_menu_share=0x7f020031;
-        public static final int ic_menu_shuffle=0x7f020032;
-        public static final int ic_menu_star=0x7f020033;
-        public static final int ic_stat_play=0x7f020034;
-        public static final int ic_stat_subsonic=0x7f020035;
-        public static final int list_background=0x7f020036;
-        public static final int list_focused_holo=0x7f020037;
-        public static final int list_item_artist=0x7f020038;
-        public static final int list_item_playlist=0x7f020039;
-        public static final int list_longpressed_holo=0x7f02003a;
-        public static final int list_pressed_holo_dark=0x7f02003b;
-        public static final int list_pressed_holo_light=0x7f02003c;
-        public static final int list_selector_background_transition_holo_dark=0x7f02003d;
-        public static final int list_selector_background_transition_holo_light=0x7f02003e;
-        public static final int list_selector_disabled_holo_dark=0x7f02003f;
-        public static final int list_selector_disabled_holo_light=0x7f020040;
-        public static final int list_selector_holo_dark=0x7f020041;
-        public static final int list_selector_holo_light=0x7f020042;
-        public static final int main_exit=0x7f020043;
-        public static final int main_header_icon=0x7f020044;
-        public static final int main_help=0x7f020045;
-        public static final int main_select_server=0x7f020046;
-        public static final int main_settings=0x7f020047;
-        public static final int main_shuffle=0x7f020048;
-        public static final int media_backward=0x7f020049;
-        public static final int media_backward_normal=0x7f02004a;
-        public static final int media_backward_pressed=0x7f02004b;
-        public static final int media_forward=0x7f02004c;
-        public static final int media_forward_normal=0x7f02004d;
-        public static final int media_forward_pressed=0x7f02004e;
-        public static final int media_pause=0x7f02004f;
-        public static final int media_pause_normal=0x7f020050;
-        public static final int media_pause_pressed=0x7f020051;
-        public static final int media_repeat_all=0x7f020052;
-        public static final int media_repeat_off=0x7f020053;
-        public static final int media_repeat_single=0x7f020054;
-        public static final int media_shuffle=0x7f020055;
-        public static final int media_shuffle_normal=0x7f020056;
-        public static final int media_shuffle_pressed=0x7f020057;
-        public static final int media_start=0x7f020058;
-        public static final int media_start_normal=0x7f020059;
-        public static final int media_start_pressed=0x7f02005a;
-        public static final int media_stop=0x7f02005b;
-        public static final int media_stop_normal=0x7f02005c;
-        public static final int media_stop_pressed=0x7f02005d;
-        public static final int media_toggle_list=0x7f02005e;
-        public static final int media_toggle_list_normal=0x7f02005f;
-        public static final int media_toggle_list_pressed=0x7f020060;
-        public static final int menu_browse=0x7f020061;
-        public static final int menu_home=0x7f020062;
-        public static final int menu_now_playing=0x7f020063;
-        public static final int menu_playlists=0x7f020064;
-        public static final int menu_search=0x7f020065;
-        public static final int menubar_button_disabled=0x7f020066;
-        public static final int menubar_button_normal=0x7f020067;
-        public static final int progress_bg_holo_dark=0x7f020068;
-        public static final int progress_horizontal_holo_dark=0x7f020069;
-        public static final int progress_primary_holo_dark=0x7f02006a;
-        public static final int progress_secondary_holo_dark=0x7f02006b;
-        public static final int refresh=0x7f02006c;
-        public static final int saved=0x7f02006d;
-        public static final int scrubber_control_normal_holo=0x7f02006e;
-        public static final int search=0x7f02006f;
-        public static final int select_album_play_all=0x7f020070;
-        public static final int select_album_play_all_normal=0x7f020071;
-        public static final int select_album_play_all_pressed=0x7f020072;
-        public static final int select_artist_folder=0x7f020073;
-        public static final int slider_knob=0x7f020074;
-        public static final int unknown_album=0x7f020075;
-        public static final int unknown_album_large=0x7f020076;
+        public static final int album_art_background=0x7f020001;
+        public static final int appwidget_art_default=0x7f020002;
+        public static final int appwidget_art_unknown=0x7f020003;
+        public static final int appwidget_bg=0x7f020004;
+        public static final int appwidget_button_background=0x7f020005;
+        public static final int appwidget_button_background_r=0x7f020006;
+        public static final int appwidget_button_center=0x7f020007;
+        public static final int appwidget_button_left=0x7f020008;
+        public static final int appwidget_button_right=0x7f020009;
+        public static final int appwidget_divider=0x7f02000a;
+        public static final int appwidget_divider_horizontal=0x7f02000b;
+        public static final int appwidget_divider_vertical=0x7f02000c;
+        public static final int appwidget_inner_focus_c=0x7f02000d;
+        public static final int appwidget_inner_focus_l=0x7f02000e;
+        public static final int appwidget_inner_focus_r=0x7f02000f;
+        public static final int appwidget_inner_press_c=0x7f020010;
+        public static final int appwidget_inner_press_l=0x7f020011;
+        public static final int appwidget_inner_press_r=0x7f020012;
+        public static final int appwidget_overlay=0x7f020013;
+        public static final int btn_check_buttonless_off=0x7f020014;
+        public static final int btn_check_buttonless_on=0x7f020015;
+        public static final int btn_check_custom=0x7f020016;
+        public static final int buttonbar_selector=0x7f020017;
+        public static final int ic_appwidget_music_next=0x7f020018;
+        public static final int ic_appwidget_music_pause=0x7f020019;
+        public static final int ic_appwidget_music_play=0x7f02001a;
+        public static final int ic_appwidget_music_previous=0x7f02001b;
+        public static final int ic_launcher=0x7f02001c;
+        public static final int ic_menu_browse=0x7f02001d;
+        public static final int ic_menu_compass=0x7f02001e;
+        public static final int ic_menu_exit=0x7f02001f;
+        public static final int ic_menu_help=0x7f020020;
+        public static final int ic_menu_home=0x7f020021;
+        public static final int ic_menu_moreoverflow=0x7f020022;
+        public static final int ic_menu_offline=0x7f020023;
+        public static final int ic_menu_play_all=0x7f020024;
+        public static final int ic_menu_playlists=0x7f020025;
+        public static final int ic_menu_refresh=0x7f020026;
+        public static final int ic_menu_remove_all=0x7f020027;
+        public static final int ic_menu_save=0x7f020028;
+        public static final int ic_menu_screen_on_off=0x7f020029;
+        public static final int ic_menu_search=0x7f02002a;
+        public static final int ic_menu_select_artist_folder=0x7f02002b;
+        public static final int ic_menu_settings=0x7f02002c;
+        public static final int ic_menu_share=0x7f02002d;
+        public static final int ic_menu_shuffle=0x7f02002e;
+        public static final int ic_stat_downloaded=0x7f02002f;
+        public static final int ic_stat_downloading=0x7f020030;
+        public static final int ic_stat_play=0x7f020031;
+        public static final int ic_stat_saved=0x7f020032;
+        public static final int ic_stat_subsonic=0x7f020033;
+        public static final int list_background=0x7f020034;
+        public static final int list_focused_holo=0x7f020035;
+        public static final int list_item_more=0x7f020036;
+        public static final int list_longpressed_holo=0x7f020037;
+        public static final int list_pressed_holo_dark=0x7f020038;
+        public static final int list_pressed_holo_light=0x7f020039;
+        public static final int list_selector_background_transition_holo_dark=0x7f02003a;
+        public static final int list_selector_background_transition_holo_light=0x7f02003b;
+        public static final int list_selector_disabled_holo_dark=0x7f02003c;
+        public static final int list_selector_disabled_holo_light=0x7f02003d;
+        public static final int list_selector_holo_dark=0x7f02003e;
+        public static final int list_selector_holo_light=0x7f02003f;
+        public static final int main_header_icon=0x7f020040;
+        public static final int media_backward=0x7f020041;
+        public static final int media_backward_normal=0x7f020042;
+        public static final int media_backward_pressed=0x7f020043;
+        public static final int media_forward=0x7f020044;
+        public static final int media_forward_normal=0x7f020045;
+        public static final int media_forward_pressed=0x7f020046;
+        public static final int media_pause=0x7f020047;
+        public static final int media_pause_normal=0x7f020048;
+        public static final int media_pause_pressed=0x7f020049;
+        public static final int media_repeat_all=0x7f02004a;
+        public static final int media_repeat_off=0x7f02004b;
+        public static final int media_repeat_single=0x7f02004c;
+        public static final int media_shuffle=0x7f02004d;
+        public static final int media_shuffle_normal=0x7f02004e;
+        public static final int media_shuffle_pressed=0x7f02004f;
+        public static final int media_start=0x7f020050;
+        public static final int media_start_normal=0x7f020051;
+        public static final int media_start_pressed=0x7f020052;
+        public static final int media_stop=0x7f020053;
+        public static final int media_stop_normal=0x7f020054;
+        public static final int media_stop_pressed=0x7f020055;
+        public static final int media_toggle_list=0x7f020056;
+        public static final int media_toggle_list_normal=0x7f020057;
+        public static final int media_toggle_list_pressed=0x7f020058;
+        public static final int menubar_button_disabled=0x7f020059;
+        public static final int menubar_button_normal=0x7f02005a;
+        public static final int progress_bg_holo_dark=0x7f02005b;
+        public static final int progress_horizontal_holo_dark=0x7f02005c;
+        public static final int progress_primary_holo_dark=0x7f02005d;
+        public static final int progress_secondary_holo_dark=0x7f02005e;
+        public static final int select_album_play_all=0x7f02005f;
+        public static final int select_album_play_all_normal=0x7f020060;
+        public static final int select_album_play_all_pressed=0x7f020061;
+        public static final int slider_knob=0x7f020062;
+        public static final int unknown_album=0x7f020063;
+        public static final int unknown_album_large=0x7f020064;
     }
     public static final class id {
         public static final int action_button_1=0x7f0c0003;
@@ -169,16 +151,16 @@ public final class R {
         public static final int actionbar_title_text=0x7f0c0001;
         public static final int album_artist=0x7f0c0007;
         public static final int album_coverart=0x7f0c0005;
-        public static final int album_menu_pin=0x7f0c007e;
-        public static final int album_menu_play_last=0x7f0c007d;
-        public static final int album_menu_play_now=0x7f0c007c;
+        public static final int album_menu_pin=0x7f0c007f;
+        public static final int album_menu_play_last=0x7f0c007e;
+        public static final int album_menu_play_now=0x7f0c007d;
         public static final int album_title=0x7f0c0006;
         public static final int appwidget_coverart=0x7f0c0008;
         public static final int appwidget_top=0x7f0c0009;
         public static final int artist=0x7f0c000b;
-        public static final int artist_menu_pin=0x7f0c0081;
-        public static final int artist_menu_play_last=0x7f0c0080;
-        public static final int artist_menu_play_now=0x7f0c007f;
+        public static final int artist_menu_pin=0x7f0c0082;
+        public static final int artist_menu_play_last=0x7f0c0081;
+        public static final int artist_menu_play_now=0x7f0c0080;
         public static final int button_bar=0x7f0c000f;
         public static final int button_bar_home=0x7f0c0010;
         public static final int button_bar_music=0x7f0c0011;
@@ -224,6 +206,7 @@ public final class R {
         public static final int help_buttons=0x7f0c0035;
         public static final int help_close=0x7f0c0037;
         public static final int help_contents=0x7f0c0038;
+        public static final int ic_menu_shuffle=0x7f0c0075;
         public static final int jukebox_volume_progress_bar=0x7f0c003a;
         public static final int lyrics_artist=0x7f0c003b;
         public static final int lyrics_text=0x7f0c003d;
@@ -248,7 +231,7 @@ public final class R {
         public static final int menu_screen_on_off=0x7f0c0078;
         public static final int menu_settings=0x7f0c0073;
         public static final int menu_show_album=0x7f0c0079;
-        public static final int menu_shuffle=0x7f0c0075;
+        public static final int menu_shuffle=0x7f0c007c;
         public static final int notification_artist=0x7f0c004b;
         public static final int notification_image=0x7f0c0049;
         public static final int notification_title=0x7f0c004a;
@@ -286,9 +269,9 @@ public final class R {
         public static final int song_artist=0x7f0c006e;
         public static final int song_check=0x7f0c006b;
         public static final int song_duration=0x7f0c006f;
-        public static final int song_menu_play_last=0x7f0c0084;
-        public static final int song_menu_play_next=0x7f0c0083;
-        public static final int song_menu_play_now=0x7f0c0082;
+        public static final int song_menu_play_last=0x7f0c0085;
+        public static final int song_menu_play_next=0x7f0c0084;
+        public static final int song_menu_play_now=0x7f0c0083;
         public static final int song_status=0x7f0c006d;
         public static final int song_title=0x7f0c006c;
         public static final int tab_progress=0x7f0c0070;

res/layout/action_bar.xml

@@ -75,6 +75,6 @@
         a:padding="5dp"
         a:scaleType="center"
         a:showAsAction="ifRoom|withText"
-        a:src="@drawable/search" />
+        a:src="@drawable/ic_menu_search" />
 
 </RelativeLayout>

res/layout/album_list_item.xml

@@ -38,7 +38,7 @@
     </LinearLayout>
 
     <ImageView
-            a:src="@drawable/list_item_artist"
+            a:src="@drawable/list_item_more"
             a:layout_width="wrap_content"
             a:layout_height="wrap_content"
             a:layout_gravity="right|center_vertical"

res/layout/button_bar.xml

@@ -23,7 +23,7 @@
             a:layout_weight="1"
             a:background="@drawable/buttonbar_selector"
             a:contentDescription="@string/button_bar.home"
-            a:src="@drawable/menu_home" />
+            a:src="@drawable/ic_menu_home" />
 
         <View
             a:layout_width="1px"
@@ -40,7 +40,7 @@
             a:layout_weight="1"
             a:background="@drawable/buttonbar_selector"
             a:contentDescription="@string/button_bar.browse"
-            a:src="@drawable/menu_browse" />
+            a:src="@drawable/ic_menu_browse" />
 
         <View
             a:layout_width="1px"
@@ -57,7 +57,7 @@
             a:layout_weight="1"
             a:background="@drawable/buttonbar_selector"
             a:contentDescription="@string/button_bar.search"
-            a:src="@drawable/menu_search" />
+            a:src="@drawable/ic_menu_search" />
 
         <View
             a:layout_width="1px"
@@ -74,7 +74,7 @@
             a:layout_weight="1"
             a:background="@drawable/buttonbar_selector"
             a:contentDescription="@string/button_bar.playlists"
-            a:src="@drawable/menu_playlists" />
+            a:src="@drawable/ic_menu_playlists" />
 
         <View
             a:layout_width="1px"
@@ -90,7 +90,7 @@
             a:layout_weight="1"
             a:background="@drawable/buttonbar_selector"
             a:contentDescription="@string/button_bar.now_playing"
-            a:src="@drawable/menu_now_playing" />
+            a:src="@drawable/ic_menu_play_all" />
 
     </LinearLayout>
 </LinearLayout>

res/layout/main_buttons.xml

@@ -56,7 +56,7 @@
     <TextView
             a:id="@+id/main_albums_newest"
             a:text="@string/main.albums_newest"
-            a:drawableRight="@drawable/list_item_artist"
+            a:drawableRight="@drawable/list_item_more"
             a:drawablePadding="6dip"
             a:layout_width="fill_parent"
             a:layout_height="wrap_content"
@@ -68,7 +68,7 @@
     <TextView
             a:id="@+id/main_albums_recent"
             a:text="@string/main.albums_recent"
-            a:drawableRight="@drawable/list_item_artist"
+            a:drawableRight="@drawable/list_item_more"
             a:drawablePadding="6dip"
             a:layout_width="fill_parent"
             a:layout_height="wrap_content"
@@ -80,7 +80,7 @@
     <TextView
             a:id="@+id/main_albums_frequent"
             a:text="@string/main.albums_frequent"
-            a:drawableRight="@drawable/list_item_artist"
+            a:drawableRight="@drawable/list_item_more"
             a:drawablePadding="6dip"
             a:layout_width="fill_parent"
             a:layout_height="wrap_content"
@@ -92,7 +92,7 @@
     <TextView
             a:id="@+id/main_albums_highest"
             a:text="@string/main.albums_highest"
-            a:drawableRight="@drawable/list_item_artist"
+            a:drawableRight="@drawable/list_item_more"
             a:drawablePadding="6dip"
             a:layout_width="fill_parent"
             a:layout_height="wrap_content"
@@ -104,7 +104,7 @@
     <TextView
             a:id="@+id/main_albums_random"
             a:text="@string/main.albums_random"
-            a:drawableRight="@drawable/list_item_artist"
+            a:drawableRight="@drawable/list_item_more"
             a:drawablePadding="6dip"
             a:layout_width="fill_parent"
             a:layout_height="wrap_content"

res/layout/playlist_list_item.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:a="http://schemas.android.com/apk/res/android"
           a:id="@android:id/text1"
-          a:drawableRight="@drawable/list_item_playlist"
+          a:drawableRight="@drawable/list_item_more"
           a:drawablePadding="6dip"
           a:layout_width="fill_parent"
           a:layout_height="wrap_content"

res/layout/search_buttons.xml

@@ -10,7 +10,7 @@
             a:layout_width="fill_parent"
             a:layout_height="wrap_content"
             a:drawablePadding="0dp"
-            a:drawableLeft="@drawable/search"
+            a:drawableLeft="@drawable/ic_menu_search"
             a:textAppearance="?android:attr/textAppearanceMedium"
             a:gravity="center"
             a:padding="12dp"/>

res/layout/select_artist.xml

@@ -8,7 +8,7 @@
 
     <View
             a:layout_width="fill_parent"
-            a:layout_height="1px"
+            a:layout_height="1dp"
             a:background="@color/dividerColor"/>
 
     <include layout="@layout/tab_progress"/>

res/layout/select_artist_header.xml

@@ -10,7 +10,7 @@
         a:minHeight="?android:attr/listPreferredItemHeight">
 
     <ImageView
-            a:src="@drawable/select_artist_folder"
+            a:src="@drawable/ic_menu_select_artist_folder"
             a:layout_gravity="center_vertical"
             a:layout_width="wrap_content"
             a:layout_height="wrap_content"/>

res/menu/nowplaying.xml

@@ -2,13 +2,13 @@
 <menu xmlns:a="http://schemas.android.com/apk/res/android">
 
     <item
-        a:id="@+id/menu_shuffle"
+        a:id="@+id/ic_menu_shuffle"
         a:icon="@drawable/ic_menu_shuffle"
         a:title="@string/download.menu_shuffle"
         />
 
     <item
-        a:id="@+id/menu_save_playlist"
+        a:id="@+id/menu_save_playlist" 
         a:icon="@drawable/ic_menu_save"
         a:title="@string/download.menu_save"
         />

src/net/sourceforge/subsonic/androidapp/activity/MainActivity.java

@@ -119,7 +119,7 @@ public class MainActivity extends SubsonicTabActivity {
 
         // Button 1: shuffle
         ImageButton actionShuffleButton = (ImageButton)findViewById(R.id.action_button_1);
-        actionShuffleButton.setImageResource(R.drawable.action_shuffle);
+        actionShuffleButton.setImageResource(R.drawable.ic_menu_shuffle);
         actionShuffleButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -131,7 +131,7 @@ public class MainActivity extends SubsonicTabActivity {
 
         // Button 2: search
         ImageButton actionSearchButton = (ImageButton)findViewById(R.id.action_button_2);
-        actionSearchButton.setImageResource(R.drawable.action_search);
+        actionSearchButton.setImageResource(R.drawable.ic_menu_search);
         actionSearchButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

src/net/sourceforge/subsonic/androidapp/activity/SearchActivity.java

@@ -140,7 +140,7 @@ public class SearchActivity extends SubsonicTabActivity {
 
         // Button 2: search
         final ImageButton actionSearchButton = (ImageButton)findViewById(R.id.action_button_2);
-        actionSearchButton.setImageResource(R.drawable.action_search);
+        actionSearchButton.setImageResource(R.drawable.ic_menu_search);
         actionSearchButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

src/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.java

@@ -172,7 +172,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
 
         // Button 1: play all
         playAllButton = (ImageButton) findViewById(R.id.action_button_1);
-        playAllButton.setImageResource(R.drawable.action_play_all);
+        playAllButton.setImageResource(R.drawable.ic_menu_play_all);
         playAllButton.setVisibility(View.GONE);
         playAllButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -183,7 +183,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
 
         // Button 2: refresh
         ImageButton refreshButton = (ImageButton) findViewById(R.id.action_button_2);
-        refreshButton.setImageResource(R.drawable.action_refresh);
+        refreshButton.setImageResource(R.drawable.ic_menu_refresh);
         refreshButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

src/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity.java

@@ -78,7 +78,7 @@ public class SelectArtistActivity extends SubsonicTabActivity implements Adapter
 
         // Button 1: shuffle
         ImageButton shuffleButton = (ImageButton) findViewById(R.id.action_button_1);
-        shuffleButton.setImageResource(R.drawable.action_shuffle);
+        shuffleButton.setImageResource(R.drawable.ic_menu_shuffle);
         shuffleButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -90,7 +90,7 @@ public class SelectArtistActivity extends SubsonicTabActivity implements Adapter
 
         // Button 2: refresh
         ImageButton refreshButton = (ImageButton) findViewById(R.id.action_button_2);
-        refreshButton.setImageResource(R.drawable.action_refresh);
+        refreshButton.setImageResource(R.drawable.ic_menu_refresh);
         refreshButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {