diff --git a/assets/images/svg/ic_wbackward_normal.svg b/assets/images/svg/ic_backward_normal_w.svg
similarity index 100%
rename from assets/images/svg/ic_wbackward_normal.svg
rename to assets/images/svg/ic_backward_normal_w.svg
diff --git a/assets/images/svg/ic_wbackward_pressed.svg b/assets/images/svg/ic_backward_pressed_w.svg
similarity index 100%
rename from assets/images/svg/ic_wbackward_pressed.svg
rename to assets/images/svg/ic_backward_pressed_w.svg
diff --git a/assets/images/svg/ic_wforward_normal.svg b/assets/images/svg/ic_forward_normal_w.svg
similarity index 100%
rename from assets/images/svg/ic_wforward_normal.svg
rename to assets/images/svg/ic_forward_normal_w.svg
diff --git a/assets/images/svg/ic_wforward_pressed.svg b/assets/images/svg/ic_forward_pressed_w.svg
similarity index 100%
rename from assets/images/svg/ic_wforward_pressed.svg
rename to assets/images/svg/ic_forward_pressed_w.svg
diff --git a/assets/images/svg/ic_wjumpto_normal.svg b/assets/images/svg/ic_jumpto_normal_w.svg
similarity index 100%
rename from assets/images/svg/ic_wjumpto_normal.svg
rename to assets/images/svg/ic_jumpto_normal_w.svg
diff --git a/assets/images/svg/ic_wnext_normal.svg b/assets/images/svg/ic_next_normal_w.svg
similarity index 100%
rename from assets/images/svg/ic_wnext_normal.svg
rename to assets/images/svg/ic_next_normal_w.svg
diff --git a/assets/images/svg/ic_wnext_pressed.svg b/assets/images/svg/ic_next_pressed_w.svg
similarity index 100%
rename from assets/images/svg/ic_wnext_pressed.svg
rename to assets/images/svg/ic_next_pressed_w.svg
diff --git a/assets/images/svg/ic_wpause_normal.svg b/assets/images/svg/ic_pause_normal_w.svg
similarity index 100%
rename from assets/images/svg/ic_wpause_normal.svg
rename to assets/images/svg/ic_pause_normal_w.svg
diff --git a/assets/images/svg/ic_wpause_pressed.svg b/assets/images/svg/ic_pause_pressed_w.svg
similarity index 100%
rename from assets/images/svg/ic_wpause_pressed.svg
rename to assets/images/svg/ic_pause_pressed_w.svg
diff --git a/assets/images/svg/ic_wplay_normal.svg b/assets/images/svg/ic_play_normal_w.svg
similarity index 100%
rename from assets/images/svg/ic_wplay_normal.svg
rename to assets/images/svg/ic_play_normal_w.svg
diff --git a/assets/images/svg/ic_wplay_pressed.svg b/assets/images/svg/ic_play_pressed_w.svg
similarity index 100%
rename from assets/images/svg/ic_wplay_pressed.svg
rename to assets/images/svg/ic_play_pressed_w.svg
diff --git a/assets/images/svg/ic_wprevious_normal.svg b/assets/images/svg/ic_previous_normal_w.svg
similarity index 100%
rename from assets/images/svg/ic_wprevious_normal.svg
rename to assets/images/svg/ic_previous_normal_w.svg
diff --git a/assets/images/svg/ic_wprevious_pressed.svg b/assets/images/svg/ic_previous_pressed_w.svg
similarity index 100%
rename from assets/images/svg/ic_wprevious_pressed.svg
rename to assets/images/svg/ic_previous_pressed_w.svg
diff --git a/assets/images/svg/ic_wsleep_normal.svg b/assets/images/svg/ic_sleep_normal_w.svg
similarity index 100%
rename from assets/images/svg/ic_wsleep_normal.svg
rename to assets/images/svg/ic_sleep_normal_w.svg
diff --git a/assets/images/svg/ic_wspeed_normal.svg b/assets/images/svg/ic_speed_normal_w.svg
similarity index 100%
rename from assets/images/svg/ic_wspeed_normal.svg
rename to assets/images/svg/ic_speed_normal_w.svg
diff --git a/assets/images/svg/ic_wstop_normal.svg b/assets/images/svg/ic_stop_normal_w.svg
similarity index 100%
rename from assets/images/svg/ic_wstop_normal.svg
rename to assets/images/svg/ic_stop_normal_w.svg
diff --git a/assets/images/svg/ic_wstop_pressed.svg b/assets/images/svg/ic_stop_pressed_w.svg
similarity index 100%
rename from assets/images/svg/ic_wstop_pressed.svg
rename to assets/images/svg/ic_stop_pressed_w.svg
diff --git a/vlc-android/res/drawable-hdpi/ic_wbackward_normal.png b/vlc-android/res/drawable-hdpi/ic_backward_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/ic_wbackward_normal.png
rename to vlc-android/res/drawable-hdpi/ic_backward_normal_w.png
diff --git a/vlc-android/res/drawable-hdpi/ic_wbackward_pressed.png b/vlc-android/res/drawable-hdpi/ic_backward_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/ic_wbackward_pressed.png
rename to vlc-android/res/drawable-hdpi/ic_backward_pressed_w.png
diff --git a/vlc-android/res/drawable-hdpi/ic_wforward_normal.png b/vlc-android/res/drawable-hdpi/ic_forward_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/ic_wforward_normal.png
rename to vlc-android/res/drawable-hdpi/ic_forward_normal_w.png
diff --git a/vlc-android/res/drawable-hdpi/ic_wforward_pressed.png b/vlc-android/res/drawable-hdpi/ic_forward_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/ic_wforward_pressed.png
rename to vlc-android/res/drawable-hdpi/ic_forward_pressed_w.png
diff --git a/vlc-android/res/drawable-hdpi/ic_wjumpto_normal.png b/vlc-android/res/drawable-hdpi/ic_jumpto_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/ic_wjumpto_normal.png
rename to vlc-android/res/drawable-hdpi/ic_jumpto_normal_w.png
diff --git a/vlc-android/res/drawable-hdpi/ic_wnext_normal.png b/vlc-android/res/drawable-hdpi/ic_next_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/ic_wnext_normal.png
rename to vlc-android/res/drawable-hdpi/ic_next_normal_w.png
diff --git a/vlc-android/res/drawable-hdpi/ic_wnext_pressed.png b/vlc-android/res/drawable-hdpi/ic_next_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/ic_wnext_pressed.png
rename to vlc-android/res/drawable-hdpi/ic_next_pressed_w.png
diff --git a/vlc-android/res/drawable-hdpi/ic_wpause_normal.png b/vlc-android/res/drawable-hdpi/ic_pause_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/ic_wpause_normal.png
rename to vlc-android/res/drawable-hdpi/ic_pause_normal_w.png
diff --git a/vlc-android/res/drawable-hdpi/ic_wpause_pressed.png b/vlc-android/res/drawable-hdpi/ic_pause_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/ic_wpause_pressed.png
rename to vlc-android/res/drawable-hdpi/ic_pause_pressed_w.png
diff --git a/vlc-android/res/drawable-hdpi/ic_wplay_normal.png b/vlc-android/res/drawable-hdpi/ic_play_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/ic_wplay_normal.png
rename to vlc-android/res/drawable-hdpi/ic_play_normal_w.png
diff --git a/vlc-android/res/drawable-hdpi/ic_wplay_pressed.png b/vlc-android/res/drawable-hdpi/ic_play_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/ic_wplay_pressed.png
rename to vlc-android/res/drawable-hdpi/ic_play_pressed_w.png
diff --git a/vlc-android/res/drawable-hdpi/ic_wprevious_normal.png b/vlc-android/res/drawable-hdpi/ic_previous_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/ic_wprevious_normal.png
rename to vlc-android/res/drawable-hdpi/ic_previous_normal_w.png
diff --git a/vlc-android/res/drawable-hdpi/ic_wprevious_pressed.png b/vlc-android/res/drawable-hdpi/ic_previous_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/ic_wprevious_pressed.png
rename to vlc-android/res/drawable-hdpi/ic_previous_pressed_w.png
diff --git a/vlc-android/res/drawable-hdpi/ic_wsleep_normal.png b/vlc-android/res/drawable-hdpi/ic_sleep_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/ic_wsleep_normal.png
rename to vlc-android/res/drawable-hdpi/ic_sleep_normal_w.png
diff --git a/vlc-android/res/drawable-hdpi/ic_wspeed_normal.png b/vlc-android/res/drawable-hdpi/ic_speed_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/ic_wspeed_normal.png
rename to vlc-android/res/drawable-hdpi/ic_speed_normal_w.png
diff --git a/vlc-android/res/drawable-hdpi/ic_wstop_normal.png b/vlc-android/res/drawable-hdpi/ic_stop_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/ic_wstop_normal.png
rename to vlc-android/res/drawable-hdpi/ic_stop_normal_w.png
diff --git a/vlc-android/res/drawable-hdpi/ic_wstop_pressed.png b/vlc-android/res/drawable-hdpi/ic_stop_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-hdpi/ic_wstop_pressed.png
rename to vlc-android/res/drawable-hdpi/ic_stop_pressed_w.png
diff --git a/vlc-android/res/drawable-ldpi/ic_wbackward_normal.png b/vlc-android/res/drawable-ldpi/ic_backward_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/ic_wbackward_normal.png
rename to vlc-android/res/drawable-ldpi/ic_backward_normal_w.png
diff --git a/vlc-android/res/drawable-ldpi/ic_wbackward_pressed.png b/vlc-android/res/drawable-ldpi/ic_backward_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/ic_wbackward_pressed.png
rename to vlc-android/res/drawable-ldpi/ic_backward_pressed_w.png
diff --git a/vlc-android/res/drawable-ldpi/ic_wforward_normal.png b/vlc-android/res/drawable-ldpi/ic_forward_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/ic_wforward_normal.png
rename to vlc-android/res/drawable-ldpi/ic_forward_normal_w.png
diff --git a/vlc-android/res/drawable-ldpi/ic_wforward_pressed.png b/vlc-android/res/drawable-ldpi/ic_forward_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/ic_wforward_pressed.png
rename to vlc-android/res/drawable-ldpi/ic_forward_pressed_w.png
diff --git a/vlc-android/res/drawable-ldpi/ic_wjumpto_normal.png b/vlc-android/res/drawable-ldpi/ic_jumpto_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/ic_wjumpto_normal.png
rename to vlc-android/res/drawable-ldpi/ic_jumpto_normal_w.png
diff --git a/vlc-android/res/drawable-ldpi/ic_wnext_normal.png b/vlc-android/res/drawable-ldpi/ic_next_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/ic_wnext_normal.png
rename to vlc-android/res/drawable-ldpi/ic_next_normal_w.png
diff --git a/vlc-android/res/drawable-ldpi/ic_wnext_pressed.png b/vlc-android/res/drawable-ldpi/ic_next_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/ic_wnext_pressed.png
rename to vlc-android/res/drawable-ldpi/ic_next_pressed_w.png
diff --git a/vlc-android/res/drawable-ldpi/ic_wpause_normal.png b/vlc-android/res/drawable-ldpi/ic_pause_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/ic_wpause_normal.png
rename to vlc-android/res/drawable-ldpi/ic_pause_normal_w.png
diff --git a/vlc-android/res/drawable-ldpi/ic_wpause_pressed.png b/vlc-android/res/drawable-ldpi/ic_pause_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/ic_wpause_pressed.png
rename to vlc-android/res/drawable-ldpi/ic_pause_pressed_w.png
diff --git a/vlc-android/res/drawable-ldpi/ic_wplay_normal.png b/vlc-android/res/drawable-ldpi/ic_play_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/ic_wplay_normal.png
rename to vlc-android/res/drawable-ldpi/ic_play_normal_w.png
diff --git a/vlc-android/res/drawable-ldpi/ic_wplay_pressed.png b/vlc-android/res/drawable-ldpi/ic_play_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/ic_wplay_pressed.png
rename to vlc-android/res/drawable-ldpi/ic_play_pressed_w.png
diff --git a/vlc-android/res/drawable-ldpi/ic_wprevious_normal.png b/vlc-android/res/drawable-ldpi/ic_previous_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/ic_wprevious_normal.png
rename to vlc-android/res/drawable-ldpi/ic_previous_normal_w.png
diff --git a/vlc-android/res/drawable-ldpi/ic_wprevious_pressed.png b/vlc-android/res/drawable-ldpi/ic_previous_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/ic_wprevious_pressed.png
rename to vlc-android/res/drawable-ldpi/ic_previous_pressed_w.png
diff --git a/vlc-android/res/drawable-ldpi/ic_wsleep_normal.png b/vlc-android/res/drawable-ldpi/ic_sleep_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/ic_wsleep_normal.png
rename to vlc-android/res/drawable-ldpi/ic_sleep_normal_w.png
diff --git a/vlc-android/res/drawable-ldpi/ic_wspeed_normal.png b/vlc-android/res/drawable-ldpi/ic_speed_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/ic_wspeed_normal.png
rename to vlc-android/res/drawable-ldpi/ic_speed_normal_w.png
diff --git a/vlc-android/res/drawable-ldpi/ic_wstop_normal.png b/vlc-android/res/drawable-ldpi/ic_stop_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/ic_wstop_normal.png
rename to vlc-android/res/drawable-ldpi/ic_stop_normal_w.png
diff --git a/vlc-android/res/drawable-ldpi/ic_wstop_pressed.png b/vlc-android/res/drawable-ldpi/ic_stop_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-ldpi/ic_wstop_pressed.png
rename to vlc-android/res/drawable-ldpi/ic_stop_pressed_w.png
diff --git a/vlc-android/res/drawable-mdpi/ic_wbackward_normal.png b/vlc-android/res/drawable-mdpi/ic_backward_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/ic_wbackward_normal.png
rename to vlc-android/res/drawable-mdpi/ic_backward_normal_w.png
diff --git a/vlc-android/res/drawable-mdpi/ic_wbackward_pressed.png b/vlc-android/res/drawable-mdpi/ic_backward_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/ic_wbackward_pressed.png
rename to vlc-android/res/drawable-mdpi/ic_backward_pressed_w.png
diff --git a/vlc-android/res/drawable-mdpi/ic_wforward_normal.png b/vlc-android/res/drawable-mdpi/ic_forward_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/ic_wforward_normal.png
rename to vlc-android/res/drawable-mdpi/ic_forward_normal_w.png
diff --git a/vlc-android/res/drawable-mdpi/ic_wforward_pressed.png b/vlc-android/res/drawable-mdpi/ic_forward_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/ic_wforward_pressed.png
rename to vlc-android/res/drawable-mdpi/ic_forward_pressed_w.png
diff --git a/vlc-android/res/drawable-mdpi/ic_wjumpto_normal.png b/vlc-android/res/drawable-mdpi/ic_jumpto_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/ic_wjumpto_normal.png
rename to vlc-android/res/drawable-mdpi/ic_jumpto_normal_w.png
diff --git a/vlc-android/res/drawable-mdpi/ic_wnext_normal.png b/vlc-android/res/drawable-mdpi/ic_next_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/ic_wnext_normal.png
rename to vlc-android/res/drawable-mdpi/ic_next_normal_w.png
diff --git a/vlc-android/res/drawable-mdpi/ic_wnext_pressed.png b/vlc-android/res/drawable-mdpi/ic_next_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/ic_wnext_pressed.png
rename to vlc-android/res/drawable-mdpi/ic_next_pressed_w.png
diff --git a/vlc-android/res/drawable-mdpi/ic_wpause_normal.png b/vlc-android/res/drawable-mdpi/ic_pause_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/ic_wpause_normal.png
rename to vlc-android/res/drawable-mdpi/ic_pause_normal_w.png
diff --git a/vlc-android/res/drawable-mdpi/ic_wpause_pressed.png b/vlc-android/res/drawable-mdpi/ic_pause_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/ic_wpause_pressed.png
rename to vlc-android/res/drawable-mdpi/ic_pause_pressed_w.png
diff --git a/vlc-android/res/drawable-mdpi/ic_wplay_normal.png b/vlc-android/res/drawable-mdpi/ic_play_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/ic_wplay_normal.png
rename to vlc-android/res/drawable-mdpi/ic_play_normal_w.png
diff --git a/vlc-android/res/drawable-mdpi/ic_wplay_pressed.png b/vlc-android/res/drawable-mdpi/ic_play_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/ic_wplay_pressed.png
rename to vlc-android/res/drawable-mdpi/ic_play_pressed_w.png
diff --git a/vlc-android/res/drawable-mdpi/ic_wprevious_normal.png b/vlc-android/res/drawable-mdpi/ic_previous_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/ic_wprevious_normal.png
rename to vlc-android/res/drawable-mdpi/ic_previous_normal_w.png
diff --git a/vlc-android/res/drawable-mdpi/ic_wprevious_pressed.png b/vlc-android/res/drawable-mdpi/ic_previous_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/ic_wprevious_pressed.png
rename to vlc-android/res/drawable-mdpi/ic_previous_pressed_w.png
diff --git a/vlc-android/res/drawable-mdpi/ic_wsleep_normal.png b/vlc-android/res/drawable-mdpi/ic_sleep_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/ic_wsleep_normal.png
rename to vlc-android/res/drawable-mdpi/ic_sleep_normal_w.png
diff --git a/vlc-android/res/drawable-mdpi/ic_wspeed_normal.png b/vlc-android/res/drawable-mdpi/ic_speed_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/ic_wspeed_normal.png
rename to vlc-android/res/drawable-mdpi/ic_speed_normal_w.png
diff --git a/vlc-android/res/drawable-mdpi/ic_wstop_normal.png b/vlc-android/res/drawable-mdpi/ic_stop_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/ic_wstop_normal.png
rename to vlc-android/res/drawable-mdpi/ic_stop_normal_w.png
diff --git a/vlc-android/res/drawable-mdpi/ic_wstop_pressed.png b/vlc-android/res/drawable-mdpi/ic_stop_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-mdpi/ic_wstop_pressed.png
rename to vlc-android/res/drawable-mdpi/ic_stop_pressed_w.png
diff --git a/vlc-android/res/drawable-xhdpi/ic_wbackward_normal.png b/vlc-android/res/drawable-xhdpi/ic_backward_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/ic_wbackward_normal.png
rename to vlc-android/res/drawable-xhdpi/ic_backward_normal_w.png
diff --git a/vlc-android/res/drawable-xhdpi/ic_wbackward_pressed.png b/vlc-android/res/drawable-xhdpi/ic_backward_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/ic_wbackward_pressed.png
rename to vlc-android/res/drawable-xhdpi/ic_backward_pressed_w.png
diff --git a/vlc-android/res/drawable-xhdpi/ic_wforward_normal.png b/vlc-android/res/drawable-xhdpi/ic_forward_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/ic_wforward_normal.png
rename to vlc-android/res/drawable-xhdpi/ic_forward_normal_w.png
diff --git a/vlc-android/res/drawable-xhdpi/ic_wforward_pressed.png b/vlc-android/res/drawable-xhdpi/ic_forward_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/ic_wforward_pressed.png
rename to vlc-android/res/drawable-xhdpi/ic_forward_pressed_w.png
diff --git a/vlc-android/res/drawable-xhdpi/ic_wjumpto_normal.png b/vlc-android/res/drawable-xhdpi/ic_jumpto_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/ic_wjumpto_normal.png
rename to vlc-android/res/drawable-xhdpi/ic_jumpto_normal_w.png
diff --git a/vlc-android/res/drawable-xhdpi/ic_wnext_normal.png b/vlc-android/res/drawable-xhdpi/ic_next_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/ic_wnext_normal.png
rename to vlc-android/res/drawable-xhdpi/ic_next_normal_w.png
diff --git a/vlc-android/res/drawable-xhdpi/ic_wnext_pressed.png b/vlc-android/res/drawable-xhdpi/ic_next_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/ic_wnext_pressed.png
rename to vlc-android/res/drawable-xhdpi/ic_next_pressed_w.png
diff --git a/vlc-android/res/drawable-xhdpi/ic_wpause_normal.png b/vlc-android/res/drawable-xhdpi/ic_pause_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/ic_wpause_normal.png
rename to vlc-android/res/drawable-xhdpi/ic_pause_normal_w.png
diff --git a/vlc-android/res/drawable-xhdpi/ic_wpause_pressed.png b/vlc-android/res/drawable-xhdpi/ic_pause_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/ic_wpause_pressed.png
rename to vlc-android/res/drawable-xhdpi/ic_pause_pressed_w.png
diff --git a/vlc-android/res/drawable-xhdpi/ic_wplay_normal.png b/vlc-android/res/drawable-xhdpi/ic_play_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/ic_wplay_normal.png
rename to vlc-android/res/drawable-xhdpi/ic_play_normal_w.png
diff --git a/vlc-android/res/drawable-xhdpi/ic_wplay_pressed.png b/vlc-android/res/drawable-xhdpi/ic_play_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/ic_wplay_pressed.png
rename to vlc-android/res/drawable-xhdpi/ic_play_pressed_w.png
diff --git a/vlc-android/res/drawable-xhdpi/ic_wprevious_normal.png b/vlc-android/res/drawable-xhdpi/ic_previous_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/ic_wprevious_normal.png
rename to vlc-android/res/drawable-xhdpi/ic_previous_normal_w.png
diff --git a/vlc-android/res/drawable-xhdpi/ic_wprevious_pressed.png b/vlc-android/res/drawable-xhdpi/ic_previous_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/ic_wprevious_pressed.png
rename to vlc-android/res/drawable-xhdpi/ic_previous_pressed_w.png
diff --git a/vlc-android/res/drawable-xhdpi/ic_wsleep_normal.png b/vlc-android/res/drawable-xhdpi/ic_sleep_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/ic_wsleep_normal.png
rename to vlc-android/res/drawable-xhdpi/ic_sleep_normal_w.png
diff --git a/vlc-android/res/drawable-xhdpi/ic_wspeed_normal.png b/vlc-android/res/drawable-xhdpi/ic_speed_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/ic_wspeed_normal.png
rename to vlc-android/res/drawable-xhdpi/ic_speed_normal_w.png
diff --git a/vlc-android/res/drawable-xhdpi/ic_wstop_normal.png b/vlc-android/res/drawable-xhdpi/ic_stop_normal_w.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/ic_wstop_normal.png
rename to vlc-android/res/drawable-xhdpi/ic_stop_normal_w.png
diff --git a/vlc-android/res/drawable-xhdpi/ic_wstop_pressed.png b/vlc-android/res/drawable-xhdpi/ic_stop_pressed_w.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/ic_wstop_pressed.png
rename to vlc-android/res/drawable-xhdpi/ic_stop_pressed_w.png
diff --git a/vlc-android/res/drawable/ic_backward_w.xml b/vlc-android/res/drawable/ic_backward_w.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4bd29a047b71e7bba79fde41b5c6fdc6cdc7dc91
--- /dev/null
+++ b/vlc-android/res/drawable/ic_backward_w.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vlc-android/res/drawable/ic_wbackward.xml b/vlc-android/res/drawable/ic_forward_w.xml
similarity index 51%
rename from vlc-android/res/drawable/ic_wbackward.xml
rename to vlc-android/res/drawable/ic_forward_w.xml
index 6c57b3e64db408b3b04862841f3926fe09fec287..b6bfa0a73cd676d0f6380ec7cc7b9ae0d10f6379 100644
--- a/vlc-android/res/drawable/ic_wbackward.xml
+++ b/vlc-android/res/drawable/ic_forward_w.xml
@@ -1,7 +1,7 @@
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/vlc-android/res/drawable/ic_wpause.xml b/vlc-android/res/drawable/ic_next_w.xml
similarity index 50%
rename from vlc-android/res/drawable/ic_wpause.xml
rename to vlc-android/res/drawable/ic_next_w.xml
index ec7537bfaf96c83e104bfb2ad7757684502d1b10..12ff268dba1fb0dab97f96199f4ac639b3bdba86 100644
--- a/vlc-android/res/drawable/ic_wpause.xml
+++ b/vlc-android/res/drawable/ic_next_w.xml
@@ -1,7 +1,7 @@
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/vlc-android/res/drawable/ic_pause_w.xml b/vlc-android/res/drawable/ic_pause_w.xml
new file mode 100644
index 0000000000000000000000000000000000000000..65e55811e8339418de9cede6028af9d2f7af830b
--- /dev/null
+++ b/vlc-android/res/drawable/ic_pause_w.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vlc-android/res/drawable/ic_play_w.xml b/vlc-android/res/drawable/ic_play_w.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b6849786cb722d16476a8e77b273f7e80961c13a
--- /dev/null
+++ b/vlc-android/res/drawable/ic_play_w.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vlc-android/res/drawable/ic_previous_w.xml b/vlc-android/res/drawable/ic_previous_w.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cf074cf6e5da49b8d2193a679de2e64be6b3eb08
--- /dev/null
+++ b/vlc-android/res/drawable/ic_previous_w.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vlc-android/res/drawable/ic_stop_w.xml b/vlc-android/res/drawable/ic_stop_w.xml
new file mode 100644
index 0000000000000000000000000000000000000000..169052337abe84656d5a0533008458f0821c84d4
--- /dev/null
+++ b/vlc-android/res/drawable/ic_stop_w.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vlc-android/res/drawable/ic_wforward.xml b/vlc-android/res/drawable/ic_wforward.xml
deleted file mode 100644
index 98ebb94e8fbcc35a1dc0b4cb70994f1a6990c1dc..0000000000000000000000000000000000000000
--- a/vlc-android/res/drawable/ic_wforward.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/vlc-android/res/drawable/ic_wnext.xml b/vlc-android/res/drawable/ic_wnext.xml
deleted file mode 100644
index 7377de912e7432039b4d0a4ee7c224ee3d7ce63d..0000000000000000000000000000000000000000
--- a/vlc-android/res/drawable/ic_wnext.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/vlc-android/res/drawable/ic_wplay.xml b/vlc-android/res/drawable/ic_wplay.xml
deleted file mode 100644
index d0cd09e212b4328330c960c25012fbe50adf1a22..0000000000000000000000000000000000000000
--- a/vlc-android/res/drawable/ic_wplay.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/vlc-android/res/drawable/ic_wprevious.xml b/vlc-android/res/drawable/ic_wprevious.xml
deleted file mode 100644
index 8b39c4c6d4d161583e3a76381b72bcd5a27da01a..0000000000000000000000000000000000000000
--- a/vlc-android/res/drawable/ic_wprevious.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/vlc-android/res/drawable/ic_wstop.xml b/vlc-android/res/drawable/ic_wstop.xml
deleted file mode 100644
index 88ec3141f3321e0d69656522cc69b7bf43f6af8b..0000000000000000000000000000000000000000
--- a/vlc-android/res/drawable/ic_wstop.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/vlc-android/res/layout/notification.xml b/vlc-android/res/layout/notification.xml
index 2cc7ff9acf4cadc6dbf8f8ca728b0a1b895dd0dc..dbfa655819f1fa664d7593e01976b592ee1c219d 100644
--- a/vlc-android/res/layout/notification.xml
+++ b/vlc-android/res/layout/notification.xml
@@ -49,7 +49,7 @@
android:background="#00ffffff"
android:clickable="true"
android:scaleType="fitXY"
- android:src="@drawable/ic_wplay" />
+ android:src="@drawable/ic_play_w" />
+ android:src="@drawable/ic_next_w" />
+ android:src="@drawable/ic_stop_w" />
\ No newline at end of file
diff --git a/vlc-android/res/layout/notification_expanded.xml b/vlc-android/res/layout/notification_expanded.xml
index d6121804a0dc29103061b7d1abd6103348d5da86..2ab5df0205953db127fcbc87a12a8d80fc3f9025 100644
--- a/vlc-android/res/layout/notification_expanded.xml
+++ b/vlc-android/res/layout/notification_expanded.xml
@@ -60,7 +60,7 @@
android:background="#00ffffff"
android:clickable="true"
android:scaleType="fitXY"
- android:src="@drawable/ic_wstop" />
+ android:src="@drawable/ic_stop_w" />
+ android:src="@drawable/ic_previous_w" />
+ android:src="@drawable/ic_play_w" />
+ android:src="@drawable/ic_next_w" />
\ No newline at end of file
diff --git a/vlc-android/res/layout/player.xml b/vlc-android/res/layout/player.xml
index 218116edf217dd671667162c60228533748d3c46..01463336e1265e022a863506e985bc48007b71a4 100644
--- a/vlc-android/res/layout/player.xml
+++ b/vlc-android/res/layout/player.xml
@@ -146,7 +146,7 @@
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:layout_toRightOf="@+id/lock_overlay_button"
- android:background="@drawable/ic_wbackward" />
+ android:background="@drawable/ic_backward_w" />
+ android:background="@drawable/ic_forward_w" />
+ android:src="@drawable/ic_previous_w" />
+ android:src="@drawable/ic_play_w" />
+ android:src="@drawable/ic_stop_w" />
+ android:src="@drawable/ic_next_w" />
diff --git a/vlc-android/res/values/styles.xml b/vlc-android/res/values/styles.xml
index 9533f7bdeadf6ca374a0d84207305e7b8b4e9398..fdffc2141993ab542fac7c42ab0c50e76966e9d1 100644
--- a/vlc-android/res/values/styles.xml
+++ b/vlc-android/res/values/styles.xml
@@ -140,9 +140,9 @@
- @drawable/advanced_options_video_background
- @color/white
- @color/white
- - @drawable/ic_wspeed_normal
- - @drawable/ic_wsleep_normal
- - @drawable/ic_wjumpto_normal
+ - @drawable/ic_speed_normal_w
+ - @drawable/ic_sleep_normal_w
+ - @drawable/ic_jumpto_normal_w
- @drawable/ic_down_w
- @drawable/ic_up_w
diff --git a/vlc-android/src/org/videolan/vlc/AudioService.java b/vlc-android/src/org/videolan/vlc/AudioService.java
index 89fafa72222d6368e728e537025d75a1705c337d..211ce845429d585dc0c6d0468af8cb1608b4faf3 100644
--- a/vlc-android/src/org/videolan/vlc/AudioService.java
+++ b/vlc-android/src/org/videolan/vlc/AudioService.java
@@ -694,7 +694,7 @@ public class AudioService extends Service {
view.setImageViewBitmap(R.id.cover, cover);
view.setTextViewText(R.id.songName, title);
view.setTextViewText(R.id.artist, artist);
- view.setImageViewResource(R.id.play_pause, mLibVLC.isPlaying() ? R.drawable.ic_wpause : R.drawable.ic_wplay);
+ view.setImageViewResource(R.id.play_pause, mLibVLC.isPlaying() ? R.drawable.ic_pause_w : R.drawable.ic_play_w);
view.setOnClickPendingIntent(R.id.play_pause, piPlay);
view.setOnClickPendingIntent(R.id.forward, piForward);
view.setOnClickPendingIntent(R.id.stop, piStop);
@@ -706,7 +706,7 @@ public class AudioService extends Service {
view_expanded.setTextViewText(R.id.songName, title);
view_expanded.setTextViewText(R.id.artist, artist);
view_expanded.setTextViewText(R.id.album, album);
- view_expanded.setImageViewResource(R.id.play_pause, mLibVLC.isPlaying() ? R.drawable.ic_wpause : R.drawable.ic_wplay);
+ view_expanded.setImageViewResource(R.id.play_pause, mLibVLC.isPlaying() ? R.drawable.ic_pause_w : R.drawable.ic_play_w);
view_expanded.setOnClickPendingIntent(R.id.backward, piBackward);
view_expanded.setOnClickPendingIntent(R.id.play_pause, piPlay);
view_expanded.setOnClickPendingIntent(R.id.forward, piForward);
diff --git a/vlc-android/src/org/videolan/vlc/widget/VLCAppWidgetProvider.java b/vlc-android/src/org/videolan/vlc/widget/VLCAppWidgetProvider.java
index 87dd80f8414712ad265d9534998211e54050956f..f229eec3910c2ee82bf042170b255cff6c7ea149 100644
--- a/vlc-android/src/org/videolan/vlc/widget/VLCAppWidgetProvider.java
+++ b/vlc-android/src/org/videolan/vlc/widget/VLCAppWidgetProvider.java
@@ -110,7 +110,7 @@ public class VLCAppWidgetProvider extends AppWidgetProvider {
views.setTextViewText(R.id.songName, title);
views.setTextViewText(R.id.artist, artist);
- views.setImageViewResource(R.id.play_pause, isplaying ? R.drawable.ic_wpause : R.drawable.ic_wplay);
+ views.setImageViewResource(R.id.play_pause, isplaying ? R.drawable.ic_pause_w : R.drawable.ic_play_w);
views.setViewVisibility(R.id.timeline_parent, artist != null && artist.length() > 0 ? View.VISIBLE : View.INVISIBLE);
}
else if (ACTION_WIDGET_UPDATE_COVER.equals(action)) {