Last part of bitmap strips for iCatcher: the 'big coloured' icon set for the 320x240x16 and the 240x320x16 displays, including the necessary changes in the .wps files and again adding the missing codec icons.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16924 a1c6a512-1295-4272-9138-f99709370657

62 files changed, 30 insertions, 118 deletions

diff --git a/wps/iCatcher.240x320x16.wps b/wps/iCatcher.240x320x16.wps
index 1a220a0..0bba043 100644
--- a/wps/iCatcher.240x320x16.wps
+++ b/wps/iCatcher.240x320x16.wps
@@ -17,62 +17,18 @@
 
 %s%acNext: %?It<%It|%?Fn<%Fn|?>>
 
-%xl|A|bat0-b.bmp|204|12|
-%xl|B|bat1-b.bmp|204|12|
-%xl|C|bat2-b.bmp|204|12|
-%xl|D|bat3-b.bmp|204|12|
-%xl|E|bat4-b.bmp|204|12|
-%t0.5 %?bp<%?bc<%xdA|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdB|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdC|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdD|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdE|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>
-%xl|F|hold0-b.bmp|164|8|
-%xl|G|holdmain-b.bmp|164|8|
-%xl|H|holdremote-b.bmp|164|8|
-%xl|I|holdboth-b.bmp|164|8|
-%?mh<%?mr<%xdI|%xdG>|%?mr<%xdH|%xdF>>
-%xl|J|repeat0-b.bmp|126|9|
-%xl|K|repeatall-b.bmp|126|9|
-%xl|L|repeatone-b.bmp|126|9|
-%xl|M|repeatshuffle-b.bmp|126|9|
-%xl|N|repeata-b-b.bmp|126|9|
-%?mm<%xdJ|%xdK|%xdL|%xdM|%xdN>
-%xl|O|shuffle0-b.bmp|91|11|
-%xl|P|shuffle1-b.bmp|91|11|
-%?ps<%xdP|%xdO>
-%xl|R|pb-play-b.bmp|11|10|
-%xl|S|pb-pause-b.bmp|11|10|
-%xl|T|pb-fforward-b.bmp|11|10|
-%xl|U|pb-rewind-b.bmp|11|10|
-%?mp<|%xdR|%xdS|%xdT|%xdU>
-%xl|a|vol0-b.bmp|34|5|
-%xl|b|vol1-b.bmp|34|5|
-%xl|c|vol2-b.bmp|34|5|
-%xl|d|vol3-b.bmp|34|5|
-%xl|e|vol4-b.bmp|34|5|
-%xl|f|vol5-b.bmp|34|5|
-%xl|g|vol6-b.bmp|34|5|
-%xl|h|vol7-b.bmp|34|5|
-%xl|i|vol8-b.bmp|34|5|
-%xl|j|ani1-b.bmp|34|5|
-%xl|k|ani2-b.bmp|34|5|
-%xl|l|ani3-b.bmp|34|5|
-%xl|m|ani4-b.bmp|34|5|
-%xl|n|ani5-b.bmp|34|5|
-%xl|o|ani6-b.bmp|34|5|
-%xl|p|ani7-b.bmp|34|5|
-%xl|q|ani8-b.bmp|34|5|
-%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdj|%xdj|%xdj>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdk|%xdk|%xdk>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdl|%xdl|%xdl>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdm|%xdm|%xdm>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdn|%xdn|%xdn>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdo|%xdo|%xdo>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdp|%xdp|%xdp>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdq|%xdq|%xdq>
-%xl|r|codec-mp1-b.bmp|168|229|
-%xl|s|codec-mp2-b.bmp|168|229|
-%xl|t|codec-mp3-b.bmp|168|229|
-%xl|u|codec-aiff-b.bmp|168|229|
-%xl|v|codec-wav-b.bmp|168|229|
-%xl|w|codec-ogg-b.bmp|168|229|
-%xl|x|codec-flac-b.bmp|168|229|
-%xl|y|codec-mpc-b.bmp|168|229|
-%xl|z|codec-ac3-b.bmp|168|229|
-%xl|V|codec-wavpack-b.bmp|168|229|
-%xl|W|codec-alac-b.bmp|168|229|
-%xl|X|codec-aac-b.bmp|168|229|
-%xl|Y|codec-shorten-b.bmp|168|229|
-%xl|Z|codec-unknown-b.bmp|168|229|
-%xl|Q|codec-ape-b.bmp|168|229|
-%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ|%xdZ|%xdZ|%xdZ|%xdZ|%xdQ>
+%xl|A|battery-b.bmp|204|12|5|
+%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
+%xl|B|hold-b.bmp|164|8|4|
+%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>
+%xl|C|repeat-b.bmp|126|9|5|
+%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>
+%xl|D|shuffle-b.bmp|91|11|2|
+%?ps<%xdDa|%xdDb>
+%xl|E|playmode-b.bmp|11|10|4|
+%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
+%xl|F|volume-b.bmp|34|5|9|
+%xl|G|animation-b.bmp|34|5|8|
+%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
+%xl|H|codec-b.bmp|168|229|21|
+%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu>
diff --git a/wps/iCatcher.320x240x16.wps b/wps/iCatcher.320x240x16.wps
index c1ad31f..99a03e7 100644
--- a/wps/iCatcher.320x240x16.wps
+++ b/wps/iCatcher.320x240x16.wps
@@ -13,62 +13,18 @@
 
 %s%acNext: %?It<%It|%?Fn<%Fn|?>>
 
-%xl|A|bat0-b.bmp|284|12|
-%xl|B|bat1-b.bmp|284|12|
-%xl|C|bat2-b.bmp|284|12|
-%xl|D|bat3-b.bmp|284|12|
-%xl|E|bat4-b.bmp|284|12|
-%t0.5 %?bp<%?bc<%xdA|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdB|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdC|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdD|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdE|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>
-%xl|F|hold0-b.bmp|244|8|
-%xl|G|holdmain-b.bmp|244|8|
-%xl|H|holdremote-b.bmp|244|8|
-%xl|I|holdboth-b.bmp|244|8|
-%?mh<%?mr<%xdI|%xdG>|%?mr<%xdH|%xdF>>
-%xl|J|repeat0-b.bmp|166|9|
-%xl|K|repeatall-b.bmp|166|9|
-%xl|L|repeatone-b.bmp|166|9|
-%xl|M|repeatshuffle-b.bmp|166|9|
-%xl|N|repeata-b-b.bmp|166|9|
-%?mm<%xdJ|%xdK|%xdL|%xdM|%xdN>
-%xl|O|shuffle0-b.bmp|131|11|
-%xl|P|shuffle1-b.bmp|131|11|
-%?ps<%xdP|%xdO>
-%xl|R|pb-play-b.bmp|11|10|
-%xl|S|pb-pause-b.bmp|11|10|
-%xl|T|pb-fforward-b.bmp|11|10|
-%xl|U|pb-rewind-b.bmp|11|10|
-%?mp<|%xdR|%xdS|%xdT|%xdU>
-%xl|a|vol0-b.bmp|34|5|
-%xl|b|vol1-b.bmp|34|5|
-%xl|c|vol2-b.bmp|34|5|
-%xl|d|vol3-b.bmp|34|5|
-%xl|e|vol4-b.bmp|34|5|
-%xl|f|vol5-b.bmp|34|5|
-%xl|g|vol6-b.bmp|34|5|
-%xl|h|vol7-b.bmp|34|5|
-%xl|i|vol8-b.bmp|34|5|
-%xl|j|ani1-b.bmp|34|5|
-%xl|k|ani2-b.bmp|34|5|
-%xl|l|ani3-b.bmp|34|5|
-%xl|m|ani4-b.bmp|34|5|
-%xl|n|ani5-b.bmp|34|5|
-%xl|o|ani6-b.bmp|34|5|
-%xl|p|ani7-b.bmp|34|5|
-%xl|q|ani8-b.bmp|34|5|
-%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdj|%xdj|%xdj>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdk|%xdk|%xdk>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdl|%xdl|%xdl>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdm|%xdm|%xdm>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdn|%xdn|%xdn>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdo|%xdo|%xdo>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdp|%xdp|%xdp>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdq|%xdq|%xdq>
-%xl|r|codec-mp1-b.bmp|248|153|
-%xl|s|codec-mp2-b.bmp|248|153|
-%xl|t|codec-mp3-b.bmp|248|153|
-%xl|u|codec-aiff-b.bmp|248|153|
-%xl|v|codec-wav-b.bmp|248|153|
-%xl|w|codec-ogg-b.bmp|248|153|
-%xl|x|codec-flac-b.bmp|248|153|
-%xl|y|codec-mpc-b.bmp|248|153|
-%xl|z|codec-ac3-b.bmp|248|153|
-%xl|V|codec-wavpack-b.bmp|248|153|
-%xl|W|codec-alac-b.bmp|248|153|
-%xl|X|codec-aac-b.bmp|248|153|
-%xl|Y|codec-shorten-b.bmp|248|153|
-%xl|Z|codec-unknown-b.bmp|248|153|
-%xl|Q|codec-ape-b.bmp|248|153|
-%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ|%xdZ|%xdZ|%xdZ|%xdZ|%xdQ>
+%xl|A|battery-b.bmp|284|12|5|
+%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
+%xl|B|hold-b.bmp|244|8|4|
+%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>
+%xl|C|repeat-b.bmp|166|9|5|
+%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>
+%xl|D|shuffle-b.bmp|131|11|2|
+%?ps<%xdDa|%xdDb>
+%xl|E|playmode-b.bmp|11|10|4|
+%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
+%xl|F|volume-b.bmp|34|5|9|
+%xl|G|animation-b.bmp|34|5|8|
+%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
+%xl|H|codec-b.bmp|248|153|21|
+%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu>
diff --git a/wps/iCatcher/ani1-b.bmp b/wps/iCatcher/ani1-b.bmp
deleted file mode 100644
index 913b485..0000000
--- a/wps/iCatcher/ani1-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/ani2-b.bmp b/wps/iCatcher/ani2-b.bmp
deleted file mode 100644
index 102bc20..0000000
--- a/wps/iCatcher/ani2-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/ani3-b.bmp b/wps/iCatcher/ani3-b.bmp
deleted file mode 100644
index a553ce7..0000000
--- a/wps/iCatcher/ani3-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/ani4-b.bmp b/wps/iCatcher/ani4-b.bmp
deleted file mode 100644
index c1a539d..0000000
--- a/wps/iCatcher/ani4-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/ani5-b.bmp b/wps/iCatcher/ani5-b.bmp
deleted file mode 100644
index 39f447b..0000000
--- a/wps/iCatcher/ani5-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/ani6-b.bmp b/wps/iCatcher/ani6-b.bmp
deleted file mode 100644
index 26b0295..0000000
--- a/wps/iCatcher/ani6-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/ani7-b.bmp b/wps/iCatcher/ani7-b.bmp
deleted file mode 100644
index cc28e09..0000000
--- a/wps/iCatcher/ani7-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/ani8-b.bmp b/wps/iCatcher/ani8-b.bmp
deleted file mode 100644
index 34bf59f..0000000
--- a/wps/iCatcher/ani8-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/animation-b.bmp b/wps/iCatcher/animation-b.bmp
new file mode 100644
index 0000000..e73dbdb
--- /dev/null
+++ b/wps/iCatcher/animation-b.bmp
diff --git a/wps/iCatcher/bat0-b.bmp b/wps/iCatcher/bat0-b.bmp
deleted file mode 100644
index ad71668..0000000
--- a/wps/iCatcher/bat0-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/bat1-b.bmp b/wps/iCatcher/bat1-b.bmp
deleted file mode 100644
index b6d9e08..0000000
--- a/wps/iCatcher/bat1-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/bat2-b.bmp b/wps/iCatcher/bat2-b.bmp
deleted file mode 100644
index 5fe4982..0000000
--- a/wps/iCatcher/bat2-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/bat3-b.bmp b/wps/iCatcher/bat3-b.bmp
deleted file mode 100644
index a5303f1..0000000
--- a/wps/iCatcher/bat3-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/bat4-b.bmp b/wps/iCatcher/bat4-b.bmp
deleted file mode 100644
index f581aae..0000000
--- a/wps/iCatcher/bat4-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/battery-b.bmp b/wps/iCatcher/battery-b.bmp
new file mode 100644
index 0000000..bda4d8e
--- /dev/null
+++ b/wps/iCatcher/battery-b.bmp
diff --git a/wps/iCatcher/codec-aac-b.bmp b/wps/iCatcher/codec-aac-b.bmp
deleted file mode 100644
index 476810b..0000000
--- a/wps/iCatcher/codec-aac-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/codec-ac3-b.bmp b/wps/iCatcher/codec-ac3-b.bmp
deleted file mode 100644
index 9406fc6..0000000
--- a/wps/iCatcher/codec-ac3-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/codec-aiff-b.bmp b/wps/iCatcher/codec-aiff-b.bmp
deleted file mode 100644
index ddc11f8..0000000
--- a/wps/iCatcher/codec-aiff-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/codec-alac-b.bmp b/wps/iCatcher/codec-alac-b.bmp
deleted file mode 100644
index 5bdc6f0..0000000
--- a/wps/iCatcher/codec-alac-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/codec-ape-b.bmp b/wps/iCatcher/codec-ape-b.bmp
deleted file mode 100644
index 4390e62..0000000
--- a/wps/iCatcher/codec-ape-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/codec-b.bmp b/wps/iCatcher/codec-b.bmp
new file mode 100644
index 0000000..b7f0573
--- /dev/null
+++ b/wps/iCatcher/codec-b.bmp
diff --git a/wps/iCatcher/codec-flac-b.bmp b/wps/iCatcher/codec-flac-b.bmp
deleted file mode 100644
index 2d909df..0000000
--- a/wps/iCatcher/codec-flac-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/codec-mp1-b.bmp b/wps/iCatcher/codec-mp1-b.bmp
deleted file mode 100644
index 05f521d..0000000
--- a/wps/iCatcher/codec-mp1-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/codec-mp2-b.bmp b/wps/iCatcher/codec-mp2-b.bmp
deleted file mode 100644
index 94db238..0000000
--- a/wps/iCatcher/codec-mp2-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/codec-mp3-b.bmp b/wps/iCatcher/codec-mp3-b.bmp
deleted file mode 100644
index e2ebc4f..0000000
--- a/wps/iCatcher/codec-mp3-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/codec-mpc-b.bmp b/wps/iCatcher/codec-mpc-b.bmp
deleted file mode 100644
index 82eddf6..0000000
--- a/wps/iCatcher/codec-mpc-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/codec-ogg-b.bmp b/wps/iCatcher/codec-ogg-b.bmp
deleted file mode 100644
index c8f731e..0000000
--- a/wps/iCatcher/codec-ogg-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/codec-shorten-b.bmp b/wps/iCatcher/codec-shorten-b.bmp
deleted file mode 100644
index 1ce5cc3..0000000
--- a/wps/iCatcher/codec-shorten-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/codec-unknown-b.bmp b/wps/iCatcher/codec-unknown-b.bmp
deleted file mode 100644
index a1baa50..0000000
--- a/wps/iCatcher/codec-unknown-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/codec-wav-b.bmp b/wps/iCatcher/codec-wav-b.bmp
deleted file mode 100644
index 0d9e675..0000000
--- a/wps/iCatcher/codec-wav-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/codec-wavpack-b.bmp b/wps/iCatcher/codec-wavpack-b.bmp
deleted file mode 100644
index 515e215..0000000
--- a/wps/iCatcher/codec-wavpack-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/hold-b.bmp b/wps/iCatcher/hold-b.bmp
new file mode 100644
index 0000000..5d9b545
--- /dev/null
+++ b/wps/iCatcher/hold-b.bmp
diff --git a/wps/iCatcher/hold0-b.bmp b/wps/iCatcher/hold0-b.bmp
deleted file mode 100644
index f4663ac..0000000
--- a/wps/iCatcher/hold0-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/holdboth-b.bmp b/wps/iCatcher/holdboth-b.bmp
deleted file mode 100644
index 12c8b53..0000000
--- a/wps/iCatcher/holdboth-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/holdmain-b.bmp b/wps/iCatcher/holdmain-b.bmp
deleted file mode 100644
index 7cc056c..0000000
--- a/wps/iCatcher/holdmain-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/holdremote-b.bmp b/wps/iCatcher/holdremote-b.bmp
deleted file mode 100644
index 0364024..0000000
--- a/wps/iCatcher/holdremote-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/pb-fforward-b.bmp b/wps/iCatcher/pb-fforward-b.bmp
deleted file mode 100644
index ccddcf2..0000000
--- a/wps/iCatcher/pb-fforward-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/pb-pause-b.bmp b/wps/iCatcher/pb-pause-b.bmp
deleted file mode 100644
index 2344361..0000000
--- a/wps/iCatcher/pb-pause-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/pb-play-b.bmp b/wps/iCatcher/pb-play-b.bmp
deleted file mode 100644
index 8c1d2f7..0000000
--- a/wps/iCatcher/pb-play-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/pb-rewind-b.bmp b/wps/iCatcher/pb-rewind-b.bmp
deleted file mode 100644
index 6c1293b..0000000
--- a/wps/iCatcher/pb-rewind-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/playmode-b.bmp b/wps/iCatcher/playmode-b.bmp
new file mode 100644
index 0000000..fd6233a
--- /dev/null
+++ b/wps/iCatcher/playmode-b.bmp
diff --git a/wps/iCatcher/repeat-b.bmp b/wps/iCatcher/repeat-b.bmp
new file mode 100644
index 0000000..384f374
--- /dev/null
+++ b/wps/iCatcher/repeat-b.bmp
diff --git a/wps/iCatcher/repeat0-b.bmp b/wps/iCatcher/repeat0-b.bmp
deleted file mode 100644
index 1914e6a..0000000
--- a/wps/iCatcher/repeat0-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/repeata-b-b.bmp b/wps/iCatcher/repeata-b-b.bmp
deleted file mode 100644
index d9a5f5a..0000000
--- a/wps/iCatcher/repeata-b-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/repeatall-b.bmp b/wps/iCatcher/repeatall-b.bmp
deleted file mode 100644
index c7cb4ef..0000000
--- a/wps/iCatcher/repeatall-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/repeatone-b.bmp b/wps/iCatcher/repeatone-b.bmp
deleted file mode 100644
index 09dd2d6..0000000
--- a/wps/iCatcher/repeatone-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/repeatshuffle-b.bmp b/wps/iCatcher/repeatshuffle-b.bmp
deleted file mode 100644
index 05a2455..0000000
--- a/wps/iCatcher/repeatshuffle-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/shuffle-b.bmp b/wps/iCatcher/shuffle-b.bmp
new file mode 100644
index 0000000..6dc3613
--- /dev/null
+++ b/wps/iCatcher/shuffle-b.bmp
diff --git a/wps/iCatcher/shuffle0-b.bmp b/wps/iCatcher/shuffle0-b.bmp
deleted file mode 100644
index f1f7cac..0000000
--- a/wps/iCatcher/shuffle0-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/shuffle1-b.bmp b/wps/iCatcher/shuffle1-b.bmp
deleted file mode 100644
index 765c5e3..0000000
--- a/wps/iCatcher/shuffle1-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/vol0-b.bmp b/wps/iCatcher/vol0-b.bmp
deleted file mode 100644
index 5a7834e..0000000
--- a/wps/iCatcher/vol0-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/vol1-b.bmp b/wps/iCatcher/vol1-b.bmp
deleted file mode 100644
index 9a7f044..0000000
--- a/wps/iCatcher/vol1-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/vol2-b.bmp b/wps/iCatcher/vol2-b.bmp
deleted file mode 100644
index dd31732..0000000
--- a/wps/iCatcher/vol2-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/vol3-b.bmp b/wps/iCatcher/vol3-b.bmp
deleted file mode 100644
index 37d542f..0000000
--- a/wps/iCatcher/vol3-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/vol4-b.bmp b/wps/iCatcher/vol4-b.bmp
deleted file mode 100644
index 8d8f4de..0000000
--- a/wps/iCatcher/vol4-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/vol5-b.bmp b/wps/iCatcher/vol5-b.bmp
deleted file mode 100644
index d1e4ac9..0000000
--- a/wps/iCatcher/vol5-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/vol6-b.bmp b/wps/iCatcher/vol6-b.bmp
deleted file mode 100644
index c77a044..0000000
--- a/wps/iCatcher/vol6-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/vol7-b.bmp b/wps/iCatcher/vol7-b.bmp
deleted file mode 100644
index d931993..0000000
--- a/wps/iCatcher/vol7-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/vol8-b.bmp b/wps/iCatcher/vol8-b.bmp
deleted file mode 100644
index 7c91b5f..0000000
--- a/wps/iCatcher/vol8-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/volume-b.bmp b/wps/iCatcher/volume-b.bmp
new file mode 100644
index 0000000..73d4c0f
--- /dev/null
+++ b/wps/iCatcher/volume-b.bmp