diff --git a/wps/UniCatcher.128x96x2.wps b/wps/UniCatcher.128x96x2.wps
new file mode 100644
index 0000000000..8f64272a92
--- /dev/null
+++ b/wps/UniCatcher.128x96x2.wps
@@ -0,0 +1,50 @@
+%wd
+
+%t1 %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt>;%t1 %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt>
+%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
+%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
+%pb|4|11|117|
+%s%ac%?in<%in|%pp> - %?it<%it|%fn>
+
+%xl|A|bat0-s.bmp|109|3|
+%xl|B|bat1-s.bmp|109|3|
+%xl|C|bat2-s.bmp|109|3|
+%xl|D|bat3-s.bmp|109|3|
+%xl|E|bat4-s.bmp|109|3|
+%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|G|holdmain-s.bmp|86|2|
+%xl|H|holdremote-s.bmp|86|2|
+%xl|I|holdboth-s.bmp|86|2|
+%xl|K|repeatall-s.bmp|66|2|
+%xl|L|repeatone-s.bmp|66|2|
+%xl|M|repeatshuffle-s.bmp|66|2|
+%xl|N|repeata-b-s.bmp|66|2|
+%xl|O|shuffle0-s.bmp|46|4|
+%xl|P|shuffle1-s.bmp|46|4|
+%xl|R|pb-play-s.bmp|3|3|
+%xl|S|pb-pause-s.bmp|3|3|
+%xl|T|pb-fforward-s.bmp|3|3|
+%xl|U|pb-rewind-s.bmp|3|3|
+%?mh<%?mr<%xdI|%xdG>|%?mr<%xdH|>>%?mm<|%xdK|%xdL|%xdM|%xdN>%?ps<%xdP|%xdO>%?mp<|%xdR|%xdS|%xdT|%xdU>
+%xl|a|vol0-s.bmp|16|1|
+%xl|b|vol1-s.bmp|16|1|
+%xl|c|vol2-s.bmp|16|1|
+%xl|d|vol3-s.bmp|16|1|
+%xl|e|vol4-s.bmp|16|1|
+%xl|f|vol5-s.bmp|16|1|
+%xl|g|vol6-s.bmp|16|1|
+%xl|h|vol7-s.bmp|16|1|
+%xl|i|vol8-s.bmp|16|1|
+%xl|j|ani1-s.bmp|16|1|
+%xl|k|ani2-s.bmp|16|1|
+%xl|l|ani3-s.bmp|16|1|
+%xl|m|ani4-s.bmp|16|1|
+%xl|n|ani5-s.bmp|16|1|
+%xl|o|ani6-s.bmp|16|1|
+%xl|p|ani7-s.bmp|16|1|
+%xl|q|ani8-s.bmp|16|1|
+%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|W|line1-128.bmp|0|0|
+%xl|X|line2-128.bmp|0|13|
+%xl|Y|line1-128.bmp|0|79|
+%xdW%xdX%xdY
\ No newline at end of file
diff --git a/wps/iCatcher.128x96x2.wps b/wps/iCatcher.128x96x2.wps
new file mode 100644
index 0000000000..0886d1d640
--- /dev/null
+++ b/wps/iCatcher.128x96x2.wps
@@ -0,0 +1,54 @@
+%wd
+
+
+%t1 %?mp<%al %pp/%pe%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt >;%t1 %?mp<%al %pp/%pe%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe|%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt >
+
+%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
+%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
+%s%ac%?in<%in|%pp> - %?it<%it|%fn>
+%pb|4|11|117|
+
+%s%acNext: %?It<%It|%?Fn<%Fn|?>>
+
+%xl|A|bat0-s.bmp|109|3|
+%xl|B|bat1-s.bmp|109|3|
+%xl|C|bat2-s.bmp|109|3|
+%xl|D|bat3-s.bmp|109|3|
+%xl|E|bat4-s.bmp|109|3|
+%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|G|holdmain-s.bmp|86|2|
+%xl|H|holdremote-s.bmp|86|2|
+%xl|I|holdboth-s.bmp|86|2|
+%xl|K|repeatall-s.bmp|66|2|
+%xl|L|repeatone-s.bmp|66|2|
+%xl|M|repeatshuffle-s.bmp|66|2|
+%xl|N|repeata-b-s.bmp|66|2|
+%xl|O|shuffle0-s.bmp|46|4|
+%xl|P|shuffle1-s.bmp|46|4|
+%xl|R|pb-play-s.bmp|3|3|
+%xl|S|pb-pause-s.bmp|3|3|
+%xl|T|pb-fforward-s.bmp|3|3|
+%xl|U|pb-rewind-s.bmp|3|3|
+%?mh<%?mr<%xdI|%xdG>|%?mr<%xdH|>>%?mm<|%xdK|%xdL|%xdM|%xdN>%?ps<%xdP|%xdO>%?mp<|%xdR|%xdS|%xdT|%xdU>
+%xl|a|vol0-s.bmp|16|1|
+%xl|b|vol1-s.bmp|16|1|
+%xl|c|vol2-s.bmp|16|1|
+%xl|d|vol3-s.bmp|16|1|
+%xl|e|vol4-s.bmp|16|1|
+%xl|f|vol5-s.bmp|16|1|
+%xl|g|vol6-s.bmp|16|1|
+%xl|h|vol7-s.bmp|16|1|
+%xl|i|vol8-s.bmp|16|1|
+%xl|j|ani1-s.bmp|16|1|
+%xl|k|ani2-s.bmp|16|1|
+%xl|l|ani3-s.bmp|16|1|
+%xl|m|ani4-s.bmp|16|1|
+%xl|n|ani5-s.bmp|16|1|
+%xl|o|ani6-s.bmp|16|1|
+%xl|p|ani7-s.bmp|16|1|
+%xl|q|ani8-s.bmp|16|1|
+%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|W|line1-128.bmp|0|0|
+%xl|X|line2-128.bmp|0|13|
+%xl|Y|line1-128.bmp|0|77|
+%xdW%xdX%xdY
\ No newline at end of file
diff --git a/wps/iCatcher.138x110x2.wps b/wps/iCatcher.138x110x2.wps
index dfbfbb6d16..3fbb2636ed 100644
--- a/wps/iCatcher.138x110x2.wps
+++ b/wps/iCatcher.138x110x2.wps
@@ -14,60 +14,18 @@
 
 %s%acNext: %?It<%It|%?Fn<%Fn|?>>
 
-%xl|A|bat0-g.bmp|116|8|
-%xl|B|bat1-g.bmp|116|8|
-%xl|C|bat2-g.bmp|116|8|
-%xl|D|bat3-g.bmp|116|8|
-%xl|E|bat4-g.bmp|116|8|
-%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|G|holdmain-g.bmp|88|5|
-%xl|H|holdremote-g.bmp|88|5|
-%xl|I|holdboth-g.bmp|88|5|
-%?mh<%?mr<%xdI|%xdG>|%?mr<%xdH|>>
-%xl|K|repeatall-g.bmp|65|6|
-%xl|L|repeatone-g.bmp|65|6|
-%xl|M|repeatshuffle-g.bmp|65|6|
-%xl|N|repeata-b-g.bmp|65|6|
-%?mm<|%xdK|%xdL|%xdM|%xdN>
-%xl|O|shuffle0-g.bmp|40|7|
-%xl|P|shuffle1-g.bmp|40|7|
-%?ps<%xdP|%xdO>
-%xl|R|pb-play-g.bmp|4|7|
-%xl|S|pb-pause-g.bmp|4|7|
-%xl|T|pb-fforward-g.bmp|4|7|
-%xl|U|pb-rewind-g.bmp|4|7|
-%?mp<|%xdR|%xdS|%xdT|%xdU>
-%xl|a|vol0-g.bmp|19|4|
-%xl|b|vol1-g.bmp|19|4|
-%xl|c|vol2-g.bmp|19|4|
-%xl|d|vol3-g.bmp|19|4|
-%xl|e|vol4-g.bmp|19|4|
-%xl|f|vol5-g.bmp|19|4|
-%xl|g|vol6-g.bmp|19|4|
-%xl|h|vol7-g.bmp|19|4|
-%xl|i|vol8-g.bmp|19|4|
-%xl|j|ani1-g.bmp|19|4|
-%xl|k|ani2-g.bmp|19|4|
-%xl|l|ani3-g.bmp|19|4|
-%xl|m|ani4-g.bmp|19|4|
-%xl|n|ani5-g.bmp|19|4|
-%xl|o|ani6-g.bmp|19|4|
-%xl|p|ani7-g.bmp|19|4|
-%xl|q|ani8-g.bmp|19|4|
-%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-g.bmp|95|66|
-%xl|s|codec-mp2-g.bmp|95|66|
-%xl|t|codec-mp3-g.bmp|95|66|
-%xl|u|codec-aiff-g.bmp|95|66|
-%xl|v|codec-wav-g.bmp|95|66|
-%xl|w|codec-ogg-g.bmp|95|66|
-%xl|x|codec-flac-g.bmp|95|66|
-%xl|y|codec-mpc-g.bmp|95|66|
-%xl|z|codec-ac3-g.bmp|95|66|
-%xl|V|codec-wavpack-g.bmp|95|66|
-%xl|W|codec-alac-g.bmp|95|66|
-%xl|X|codec-aac-g.bmp|95|66|
-%xl|Y|codec-shorten-g.bmp|95|66|
-%xl|Z|codec-unknown-g.bmp|95|66|
-%xl|Q|codec-ape-g.bmp|95|66|
-%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ|%xdZ|%xdZ|%xdZ|%xdZ|%xdQ>
+%xl|A|battery-g.bmp|116|8|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-g.bmp|88|5|3|
+%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|>>
+%xl|C|repeat-g.bmp|65|6|4|
+%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>
+%xl|D|shuffle-g.bmp|40|7|2|
+%?ps<%xdDa|%xdDb>
+%xl|E|playmode-g.bmp|4|7|4|
+%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
+%xl|F|volume-g.bmp|19|4|9|
+%xl|G|animation-g.bmp|19|4|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-g.bmp|95|66|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.160x128x2.wps b/wps/iCatcher.160x128x2.wps
index 17578d93e2..5de1f2b53a 100644
--- a/wps/iCatcher.160x128x2.wps
+++ b/wps/iCatcher.160x128x2.wps
@@ -15,60 +15,18 @@
 
 %s%acNext: %?It<%It|%?Fn<%Fn|?>>
 
-%xl|A|bat0-g.bmp|135|8|
-%xl|B|bat1-g.bmp|135|8|
-%xl|C|bat2-g.bmp|135|8|
-%xl|D|bat3-g.bmp|135|8|
-%xl|E|bat4-g.bmp|135|8|
-%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|G|holdmain-g.bmp|106|5|
-%xl|H|holdremote-g.bmp|106|5|
-%xl|I|holdboth-g.bmp|106|5|
-%?mh<%?mr<%xdI|%xdG>|%?mr<%xdH|>>
-%xl|K|repeatall-g.bmp|83|6|
-%xl|L|repeatone-g.bmp|83|6|
-%xl|M|repeatshuffle-g.bmp|83|6|
-%xl|N|repeata-b-g.bmp|83|6|
-%?mm<|%xdK|%xdL|%xdM|%xdN>
-%xl|O|shuffle0-g.bmp|58|7|
-%xl|P|shuffle1-g.bmp|58|7|
-%?ps<%xdP|%xdO>
-%xl|R|pb-play-g.bmp|6|7|
-%xl|S|pb-pause-g.bmp|6|7|
-%xl|T|pb-fforward-g.bmp|6|7|
-%xl|U|pb-rewind-g.bmp|6|7|
-%?mp<|%xdR|%xdS|%xdT|%xdU>
-%xl|a|vol0-g.bmp|24|4|
-%xl|b|vol1-g.bmp|24|4|
-%xl|c|vol2-g.bmp|24|4|
-%xl|d|vol3-g.bmp|24|4|
-%xl|e|vol4-g.bmp|24|4|
-%xl|f|vol5-g.bmp|24|4|
-%xl|g|vol6-g.bmp|24|4|
-%xl|h|vol7-g.bmp|24|4|
-%xl|i|vol8-g.bmp|24|4|
-%xl|j|ani1-g.bmp|24|4|
-%xl|k|ani2-g.bmp|24|4|
-%xl|l|ani3-g.bmp|24|4|
-%xl|m|ani4-g.bmp|24|4|
-%xl|n|ani5-g.bmp|24|4|
-%xl|o|ani6-g.bmp|24|4|
-%xl|p|ani7-g.bmp|24|4|
-%xl|q|ani8-g.bmp|24|4|
-%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-g.bmp|115|85|
-%xl|s|codec-mp2-g.bmp|115|85|
-%xl|t|codec-mp3-g.bmp|115|85|
-%xl|u|codec-aiff-g.bmp|115|85|
-%xl|v|codec-wav-g.bmp|115|85|
-%xl|w|codec-ogg-g.bmp|115|85|
-%xl|x|codec-flac-g.bmp|115|85|
-%xl|y|codec-mpc-g.bmp|115|85|
-%xl|z|codec-ac3-g.bmp|115|85|
-%xl|V|codec-wavpack-g.bmp|115|85|
-%xl|W|codec-alac-g.bmp|115|85|
-%xl|X|codec-aac-g.bmp|115|85|
-%xl|Y|codec-shorten-g.bmp|115|85|
-%xl|Z|codec-unknown-g.bmp|115|85|
-%xl|Q|codec-ape-g.bmp|115|85|
-%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ|%xdZ|%xdZ|%xdZ|%xdZ|%xdQ>
+%xl|A|battery-g.bmp|135|8|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-g.bmp|106|5|3|
+%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|>>
+%xl|C|repeat-g.bmp|83|6|4|
+%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>
+%xl|D|shuffle-g.bmp|58|7|2|
+%?ps<%xdDa|%xdDb>
+%xl|E|playmode-g.bmp|6|7|4|
+%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
+%xl|F|volume-g.bmp|24|4|9|
+%xl|G|animation-g.bmp|24|4|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-g.bmp|115|85|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-g.bmp b/wps/iCatcher/ani1-g.bmp
deleted file mode 100644
index 038e330a91..0000000000
Binary files a/wps/iCatcher/ani1-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/ani2-g.bmp b/wps/iCatcher/ani2-g.bmp
deleted file mode 100644
index d8afaa5d5b..0000000000
Binary files a/wps/iCatcher/ani2-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/ani3-g.bmp b/wps/iCatcher/ani3-g.bmp
deleted file mode 100644
index 662acd097e..0000000000
Binary files a/wps/iCatcher/ani3-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/ani4-g.bmp b/wps/iCatcher/ani4-g.bmp
deleted file mode 100644
index e2aa6e57f5..0000000000
Binary files a/wps/iCatcher/ani4-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/ani5-g.bmp b/wps/iCatcher/ani5-g.bmp
deleted file mode 100644
index 9601560e0e..0000000000
Binary files a/wps/iCatcher/ani5-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/ani6-g.bmp b/wps/iCatcher/ani6-g.bmp
deleted file mode 100644
index 03d488004e..0000000000
Binary files a/wps/iCatcher/ani6-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/ani7-g.bmp b/wps/iCatcher/ani7-g.bmp
deleted file mode 100644
index ee81014244..0000000000
Binary files a/wps/iCatcher/ani7-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/ani8-g.bmp b/wps/iCatcher/ani8-g.bmp
deleted file mode 100644
index cb535f0658..0000000000
Binary files a/wps/iCatcher/ani8-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/animation-g.bmp b/wps/iCatcher/animation-g.bmp
new file mode 100644
index 0000000000..c0ba9f7ada
Binary files /dev/null and b/wps/iCatcher/animation-g.bmp differ
diff --git a/wps/iCatcher/bat0-g.bmp b/wps/iCatcher/bat0-g.bmp
deleted file mode 100644
index c74cef632b..0000000000
Binary files a/wps/iCatcher/bat0-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/bat1-g.bmp b/wps/iCatcher/bat1-g.bmp
deleted file mode 100644
index 0c7932e400..0000000000
Binary files a/wps/iCatcher/bat1-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/bat2-g.bmp b/wps/iCatcher/bat2-g.bmp
deleted file mode 100644
index 4d717742b8..0000000000
Binary files a/wps/iCatcher/bat2-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/bat3-g.bmp b/wps/iCatcher/bat3-g.bmp
deleted file mode 100644
index c96c1bdc8d..0000000000
Binary files a/wps/iCatcher/bat3-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/bat4-g.bmp b/wps/iCatcher/bat4-g.bmp
deleted file mode 100644
index be62640e8d..0000000000
Binary files a/wps/iCatcher/bat4-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/battery-g.bmp b/wps/iCatcher/battery-g.bmp
new file mode 100644
index 0000000000..3c75a91129
Binary files /dev/null and b/wps/iCatcher/battery-g.bmp differ
diff --git a/wps/iCatcher/codec-aac-g.bmp b/wps/iCatcher/codec-aac-g.bmp
deleted file mode 100644
index 43cc8c52db..0000000000
Binary files a/wps/iCatcher/codec-aac-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/codec-ac3-g.bmp b/wps/iCatcher/codec-ac3-g.bmp
deleted file mode 100644
index 24a8b3b920..0000000000
Binary files a/wps/iCatcher/codec-ac3-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/codec-aiff-g.bmp b/wps/iCatcher/codec-aiff-g.bmp
deleted file mode 100644
index 5677d0942c..0000000000
Binary files a/wps/iCatcher/codec-aiff-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/codec-alac-g.bmp b/wps/iCatcher/codec-alac-g.bmp
deleted file mode 100644
index fe7dc6cff6..0000000000
Binary files a/wps/iCatcher/codec-alac-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/codec-ape-g.bmp b/wps/iCatcher/codec-ape-g.bmp
deleted file mode 100644
index b419d26141..0000000000
Binary files a/wps/iCatcher/codec-ape-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/codec-flac-g.bmp b/wps/iCatcher/codec-flac-g.bmp
deleted file mode 100644
index bf611d199c..0000000000
Binary files a/wps/iCatcher/codec-flac-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/codec-g.bmp b/wps/iCatcher/codec-g.bmp
new file mode 100644
index 0000000000..cabb927245
Binary files /dev/null and b/wps/iCatcher/codec-g.bmp differ
diff --git a/wps/iCatcher/codec-mp1-g.bmp b/wps/iCatcher/codec-mp1-g.bmp
deleted file mode 100644
index 50d42a68d6..0000000000
Binary files a/wps/iCatcher/codec-mp1-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/codec-mp2-g.bmp b/wps/iCatcher/codec-mp2-g.bmp
deleted file mode 100644
index 5dd7f83451..0000000000
Binary files a/wps/iCatcher/codec-mp2-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/codec-mp3-g.bmp b/wps/iCatcher/codec-mp3-g.bmp
deleted file mode 100644
index ecab90bdcb..0000000000
Binary files a/wps/iCatcher/codec-mp3-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/codec-mpc-g.bmp b/wps/iCatcher/codec-mpc-g.bmp
deleted file mode 100644
index 34abb5afb4..0000000000
Binary files a/wps/iCatcher/codec-mpc-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/codec-ogg-g.bmp b/wps/iCatcher/codec-ogg-g.bmp
deleted file mode 100644
index 62fc2dc950..0000000000
Binary files a/wps/iCatcher/codec-ogg-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/codec-shorten-g.bmp b/wps/iCatcher/codec-shorten-g.bmp
deleted file mode 100644
index bddd28d0b9..0000000000
Binary files a/wps/iCatcher/codec-shorten-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/codec-unknown-g.bmp b/wps/iCatcher/codec-unknown-g.bmp
deleted file mode 100644
index b548c9dca1..0000000000
Binary files a/wps/iCatcher/codec-unknown-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/codec-wav-g.bmp b/wps/iCatcher/codec-wav-g.bmp
deleted file mode 100644
index 1e7681774f..0000000000
Binary files a/wps/iCatcher/codec-wav-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/codec-wavpack-g.bmp b/wps/iCatcher/codec-wavpack-g.bmp
deleted file mode 100644
index ace139f079..0000000000
Binary files a/wps/iCatcher/codec-wavpack-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/hold-g.bmp b/wps/iCatcher/hold-g.bmp
new file mode 100644
index 0000000000..4c0d3873fa
Binary files /dev/null and b/wps/iCatcher/hold-g.bmp differ
diff --git a/wps/iCatcher/holdboth-g.bmp b/wps/iCatcher/holdboth-g.bmp
deleted file mode 100644
index 236c29db53..0000000000
Binary files a/wps/iCatcher/holdboth-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/holdmain-g.bmp b/wps/iCatcher/holdmain-g.bmp
deleted file mode 100644
index 5fdf153458..0000000000
Binary files a/wps/iCatcher/holdmain-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/holdremote-g.bmp b/wps/iCatcher/holdremote-g.bmp
deleted file mode 100644
index 0ed1a983f5..0000000000
Binary files a/wps/iCatcher/holdremote-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/pb-fforward-g.bmp b/wps/iCatcher/pb-fforward-g.bmp
deleted file mode 100644
index ca9dda8a13..0000000000
Binary files a/wps/iCatcher/pb-fforward-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/pb-pause-g.bmp b/wps/iCatcher/pb-pause-g.bmp
deleted file mode 100644
index 73aa0953c4..0000000000
Binary files a/wps/iCatcher/pb-pause-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/pb-play-g.bmp b/wps/iCatcher/pb-play-g.bmp
deleted file mode 100644
index 3f1ea52925..0000000000
Binary files a/wps/iCatcher/pb-play-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/pb-rewind-g.bmp b/wps/iCatcher/pb-rewind-g.bmp
deleted file mode 100644
index cfe567404f..0000000000
Binary files a/wps/iCatcher/pb-rewind-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/playmode-g.bmp b/wps/iCatcher/playmode-g.bmp
new file mode 100644
index 0000000000..3e890d2527
Binary files /dev/null and b/wps/iCatcher/playmode-g.bmp differ
diff --git a/wps/iCatcher/repeat-g.bmp b/wps/iCatcher/repeat-g.bmp
new file mode 100644
index 0000000000..e127e0c5cd
Binary files /dev/null and b/wps/iCatcher/repeat-g.bmp differ
diff --git a/wps/iCatcher/repeata-b-g.bmp b/wps/iCatcher/repeata-b-g.bmp
deleted file mode 100644
index 61e2611bd7..0000000000
Binary files a/wps/iCatcher/repeata-b-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/repeatall-g.bmp b/wps/iCatcher/repeatall-g.bmp
deleted file mode 100644
index 9ada6fb3c3..0000000000
Binary files a/wps/iCatcher/repeatall-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/repeatone-g.bmp b/wps/iCatcher/repeatone-g.bmp
deleted file mode 100644
index 4166ec8f68..0000000000
Binary files a/wps/iCatcher/repeatone-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/repeatshuffle-g.bmp b/wps/iCatcher/repeatshuffle-g.bmp
deleted file mode 100644
index 25dffbd7a5..0000000000
Binary files a/wps/iCatcher/repeatshuffle-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/shuffle-g.bmp b/wps/iCatcher/shuffle-g.bmp
new file mode 100644
index 0000000000..de51aadc53
Binary files /dev/null and b/wps/iCatcher/shuffle-g.bmp differ
diff --git a/wps/iCatcher/shuffle0-g.bmp b/wps/iCatcher/shuffle0-g.bmp
deleted file mode 100644
index 9595058cb5..0000000000
Binary files a/wps/iCatcher/shuffle0-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/shuffle1-g.bmp b/wps/iCatcher/shuffle1-g.bmp
deleted file mode 100644
index 4e4bf03111..0000000000
Binary files a/wps/iCatcher/shuffle1-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/vol0-g.bmp b/wps/iCatcher/vol0-g.bmp
deleted file mode 100644
index 830d9b6adf..0000000000
Binary files a/wps/iCatcher/vol0-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/vol1-g.bmp b/wps/iCatcher/vol1-g.bmp
deleted file mode 100644
index e7f9308222..0000000000
Binary files a/wps/iCatcher/vol1-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/vol2-g.bmp b/wps/iCatcher/vol2-g.bmp
deleted file mode 100644
index ff6f437bd7..0000000000
Binary files a/wps/iCatcher/vol2-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/vol3-g.bmp b/wps/iCatcher/vol3-g.bmp
deleted file mode 100644
index c7f0e5dffc..0000000000
Binary files a/wps/iCatcher/vol3-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/vol4-g.bmp b/wps/iCatcher/vol4-g.bmp
deleted file mode 100644
index c2ea8518f6..0000000000
Binary files a/wps/iCatcher/vol4-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/vol5-g.bmp b/wps/iCatcher/vol5-g.bmp
deleted file mode 100644
index b17141a792..0000000000
Binary files a/wps/iCatcher/vol5-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/vol6-g.bmp b/wps/iCatcher/vol6-g.bmp
deleted file mode 100644
index 65dd206615..0000000000
Binary files a/wps/iCatcher/vol6-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/vol7-g.bmp b/wps/iCatcher/vol7-g.bmp
deleted file mode 100644
index 9d43b37d59..0000000000
Binary files a/wps/iCatcher/vol7-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/vol8-g.bmp b/wps/iCatcher/vol8-g.bmp
deleted file mode 100644
index 6bcc9ce92a..0000000000
Binary files a/wps/iCatcher/vol8-g.bmp and /dev/null differ
diff --git a/wps/iCatcher/volume-g.bmp b/wps/iCatcher/volume-g.bmp
new file mode 100644
index 0000000000..175170befa
Binary files /dev/null and b/wps/iCatcher/volume-g.bmp differ