Next chapter of 'Bitmap strips for Rockboxed': the greyscale versions and the ports which use 'small colour' icons (c200 and small H10). To get rid of some more bitmaps I put statically loaded bitmaps into the already existing backdrop, but one of these files can't be deleted yet because it's used in other colour version (will be done once this is ready). Also remove the unnecessary coordinates in the backdrop tag and add the missing codecs in the codec conditional. The volume and battery icons are now made of one graphic (part of a strip) for each step of the conditional, the combining of small images made a really confusing wps code and isn't helpfull anymore (I think it was done to reduce the amount of files in the svn directory...). Also rename the sl-* bmps to shuffle-* and the hd-* to lock-* bmps. - Don't forget to clean up your 'Rockboxed' directory.

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

54 files changed, 56 insertions, 162 deletions

diff --git a/wps/Rockboxed.128x128x16.wps b/wps/Rockboxed.128x128x16.wps
index c057398..c188d8f 100644
--- a/wps/Rockboxed.128x128x16.wps
+++ b/wps/Rockboxed.128x128x16.wps
@@ -1,42 +1,14 @@
 # (C) 2007, Roan Horning <roan@horning.us>
 # License: GNU GPL v2 or later.
 %wd
-%X|bg-128x128x16.bmp|0|0|
+%X|bg-128x128x16.bmp|
 %P|pg-108.bmp|
-%x|o|pgln-108.bmp|10|76|
-%xl|p|ply-color-small.bmp|62|109|
-%xl|q|ps-color-small.bmp|62|109|
-%xl|f|ff-color-small.bmp|62|109|
-%xl|r|rw-color-small.bmp|62|109|
-%xl|b|sl-color-small.bmp|34|109|
-%x|s|spk-color.bmp|3|109|
-%xl|A|v01-color.bmp|15|109|
-%xl|B|v02-color.bmp|17|109|
-%xl|C|v03-color.bmp|19|109|
-%xl|D|v04-color.bmp|21|109|
-%xl|E|v05-color.bmp|23|109|
-%xl|F|v06-color.bmp|25|109|
-%xl|G|v07-color.bmp|27|109|
-%xl|H|v08-color.bmp|29|109|
-%xl|I|v09-color-small.bmp|31|109|
-%xl|Z|n-color-small.bmp|119|114|
-%xl|Y|n-color-small.bmp|117|114|
-%xl|X|n-color-small.bmp|115|114|
-%xl|W|n-color-small.bmp|113|114|
-%xl|V|n-color-small.bmp|111|114|
-%xl|U|n-color-small.bmp|109|114|
-%xl|T|n-color-small.bmp|107|114|
-%xl|S|n-color-small.bmp|105|114|
-%xl|R|n-color-small.bmp|103|114|
-%xl|Q|n-color-small.bmp|101|114|
-%xl|P|l-color-small.bmp|103|114|
-%xl|O|l-color-small.bmp|101|114|
-%x|N|bt-color-small.bmp|99|112|
-%xl|z|ra-color-small.bmp|47|109|
-%xl|y|ro-color-small.bmp|47|109|
-%xl|x|rs-color-small.bmp|47|109|
-%xl|w|rab-color-small.bmp|47|109|
-%xl|h|hd-color.bmp|78|109|
+%xl|A|mode-color-small.bmp|62|109|4|
+%xl|B|shuffle-color-small.bmp|34|109|
+%xl|C|volume-color-small.bmp|15|111|9|
+%xl|D|battery-color-small.bmp|101|113|11|
+%xl|E|repeat-color-small.bmp|47|109|4|
+%xl|F|lock-color.bmp|78|109|
 
 %al %s%ac%?ia<%ia|%d2>%ar 
 %al %s%ac%?id<%id|%d1>%ar 
@@ -44,10 +16,10 @@
 
 %ac%t3%ig;%ac%iy 
 %pb|5|10|118|76|
-%al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown>%ar%pt 
-%?ps<%xdb>
-%?mp<%xdq|%xdp|%xdq|%xdf|%xdr>
-%?mm<|%xdz|%xdy|%xdx|%xdw>
-%?mh<%xdh>
-%?pv<|%xdA|%xdA%xdB|%xdA%xdB%xdC|%xdA%xdB%xdC%xdD|%xdA%xdB%xdC%xdD%xdE|%xdA%xdB%xdC%xdD%xdE%xdF|%xdA%xdB%xdC%xdD%xdE%xdF%xdG|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH%xdI>
-%?bl<|%xdO|%xdO%xdP|%xdQ%xdR|%xdQ%xdR%xdS|%xdQ%xdR%xdS%xdT|%xdQ%xdR%xdS%xdT%xdU|%xdQ%xdR%xdS%xdT%xdU%xdV|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX%xdY|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX%xdY%xdZ>
+%al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt 
+%?ps<%xdB>
+%?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd>
+%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
+%?mh<%xdF>
+%?pv<|%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi>
+%?bl<|%xdDa|%xdDb|%xdDc|%xdDd|%xdDe|%xdDf|%xdDg|%xdDh|%xdDi|%xdDj|%xdDk>
diff --git a/wps/Rockboxed.132x80x16.wps b/wps/Rockboxed.132x80x16.wps
index 3f7c5ef..9300613 100644
--- a/wps/Rockboxed.132x80x16.wps
+++ b/wps/Rockboxed.132x80x16.wps
@@ -1,51 +1,23 @@
 # (C) 2007, Roan Horning <roan@horning.us>
 # License: GNU GPL v2 or later.
 %wd
-%X|bg-132x80x16.bmp|0|0|
+%X|bg-132x80x16.bmp|
 %P|pg-108.bmp|
-%x|o|pgln-108.bmp|12|43|
-%xl|p|ply-color-small.bmp|62|65|
-%xl|q|ps-color-small.bmp|62|65|
-%xl|f|ff-color-small.bmp|62|65|
-%xl|r|rw-color-small.bmp|62|65|
-%xl|b|sl-color-small.bmp|34|65|
-%x|s|spk-color.bmp|3|65|
-%xl|A|v01-color.bmp|15|65|
-%xl|B|v02-color.bmp|17|65|
-%xl|C|v03-color.bmp|19|65|
-%xl|D|v04-color.bmp|21|65|
-%xl|E|v05-color.bmp|23|65|
-%xl|F|v06-color.bmp|25|65|
-%xl|G|v07-color.bmp|27|65|
-%xl|H|v08-color.bmp|29|65|
-%xl|I|v09-color-small.bmp|31|65|
-%xl|Z|n-color-small.bmp|123|68|
-%xl|Y|n-color-small.bmp|121|68|
-%xl|X|n-color-small.bmp|119|68|
-%xl|W|n-color-small.bmp|117|68|
-%xl|V|n-color-small.bmp|115|68|
-%xl|U|n-color-small.bmp|113|68|
-%xl|T|n-color-small.bmp|111|68|
-%xl|S|n-color-small.bmp|109|68|
-%xl|R|n-color-small.bmp|107|68|
-%xl|Q|n-color-small.bmp|105|68|
-%xl|P|l-color-small.bmp|107|68|
-%xl|O|l-color-small.bmp|105|68|
-%x|N|bt-color-small.bmp|103|66|
-%xl|z|ra-color-small.bmp|47|65|
-%xl|y|ro-color-small.bmp|47|65|
-%xl|x|rs-color-small.bmp|47|65|
-%xl|w|rab-color-small.bmp|47|65|
-%xl|h|hd-color.bmp|82|65|
+%xl|A|mode-color-small.bmp|62|65|4|
+%xl|B|shuffle-color-small.bmp|34|65|
+%xl|C|volume-color-small.bmp|15|67|9|
+%xl|D|battery-color-small.bmp|105|69|11|
+%xl|E|repeat-color-small.bmp|47|65|4|
+%xl|F|lock-color.bmp|82|65|
 
 %al %s%ac%?ia<%ia|%d2>%ar 
 %al %s%ac%?id<%id|%d1>%ar 
 %al %s%ac%?it<%it|%fn>%ar 
 %pb|5|12|118|43|
-%al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown>%ar%pt  
-%?ps<%xdb>
-%?mp<%xdq|%xdp|%xdq|%xdf|%xdr>
-%?mm<|%xdz|%xdy|%xdx|%xdw>
-%?mh<%xdh>
-%?pv<|%xdA|%xdA%xdB|%xdA%xdB%xdC|%xdA%xdB%xdC%xdD|%xdA%xdB%xdC%xdD%xdE|%xdA%xdB%xdC%xdD%xdE%xdF|%xdA%xdB%xdC%xdD%xdE%xdF%xdG|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH%xdI>
-%?bl<|%xdO|%xdO%xdP|%xdQ%xdR|%xdQ%xdR%xdS|%xdQ%xdR%xdS%xdT|%xdQ%xdR%xdS%xdT%xdU|%xdQ%xdR%xdS%xdT%xdU%xdV|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX%xdY|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX%xdY%xdZ>
+%al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown|nsf|speex|spc|ape|wma>%ar%pt  
+%?ps<%xdB>
+%?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd>
+%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
+%?mh<%xdF>
+%?pv<|%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi>
+%?bl<|%xdDa|%xdDb|%xdDc|%xdDd|%xdDe|%xdDf|%xdDg|%xdDh|%xdDi|%xdDj|%xdDk>
diff --git a/wps/Rockboxed.138x110x2.wps b/wps/Rockboxed.138x110x2.wps
index e803918..4191412 100644
--- a/wps/Rockboxed.138x110x2.wps
+++ b/wps/Rockboxed.138x110x2.wps
@@ -1,49 +1,24 @@
 # (C) 2007, Roan Horning <roan@horning.us>
 # License: GNU GPL v2 or later.
 %wd
-%X|bg-138x110x2.bmp|0|0|
+%X|bg-138x110x2.bmp|
 %P|pg-grey-118.bmp|
-%xl|p|ply-grey-big.bmp|68|91|
-%xl|q|ps-grey-big.bmp|68|91|
-%xl|f|ff-grey-big.bmp|68|91|
-%xl|r|rw-grey-big.bmp|68|91|
-%xl|b|sl-grey-medium.bmp|35|91|
-%xl|A|v01-grey-big.bmp|15|91|
-%xl|B|v02-grey-big.bmp|17|91|
-%xl|C|v03-grey-big.bmp|19|91|
-%xl|D|v04-grey-big.bmp|21|91|
-%xl|E|v05-grey-big.bmp|23|91|
-%xl|F|v06-grey-big.bmp|25|91|
-%xl|G|v07-grey-big.bmp|27|91|
-%xl|H|v08-grey-big.bmp|29|91|
-%xl|I|v11-grey-big.bmp|31|91|
-%xl|Z|n-grey-medium.bmp|129|95|
-%xl|Y|n-grey-medium.bmp|127|95|
-%xl|X|n-grey-medium.bmp|125|95|
-%xl|W|n-grey-medium.bmp|123|95|
-%xl|V|n-grey-medium.bmp|121|95|
-%xl|U|n-grey-medium.bmp|119|95|
-%xl|T|n-grey-medium.bmp|117|95|
-%xl|S|n-grey-medium.bmp|115|95|
-%xl|R|n-grey-medium.bmp|113|95|
-%xl|Q|n-grey-medium.bmp|111|95|
-%xl|P|l-grey-medium.bmp|113|95|
-%xl|O|l-grey-medium.bmp|111|95|
-%xl|z|ra-grey-medium.bmp|51|91|
-%xl|y|ro-grey-medium.bmp|51|91|
-%xl|x|rs-grey-medium.bmp|51|91|
-%xl|w|rab-grey-medium.bmp|51|91|
-%xl|h|hd-grey-big.bmp|88|90|
+%xl|A|mode-grey.bmp|68|91|4|
+%xl|B|shuffle-grey-medium.bmp|35|91|
+%xl|C|volume-grey.bmp|15|93|9|
+%xl|D|battery-grey-medium.bmp|111|95|11|
+%xl|E|repeat-grey-medium.bmp|51|91|4|
+%xl|F|lock-grey.bmp|88|90|
 
 %al %s%ac%?ia<%ia|%d2>%ar 
 %al %s%ac%?id<%id|%d1>%ar 
 %al %s%ac%?it<%it|%fn>%ar 
 %ac%t3%ig;%ac%iy 
 %pb|5|10|128|
-%al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown>%ar%pt  
-%?ps<%xdb>
-%?mp<%xdq|%xdp|%xdq|%xdf|%xdr>
-%?mm<|%xdz|%xdy|%xdx|%xdw>
-%?mh<%xdh>
-%?pv<|%xdA|%xdA%xdB|%xdA%xdB%xdC|%xdA%xdB%xdC%xdD|%xdA%xdB%xdC%xdD%xdE|%xdA%xdB%xdC%xdD%xdE%xdF|%xdA%xdB%xdC%xdD%xdE%xdF%xdG|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH%xdI>
-%?bl<|%xdO|%xdO%xdP|%xdQ%xdR|%xdQ%xdR%xdS|%xdQ%xdR%xdS%xdT|%xdQ%xdR%xdS%xdT%xdU|%xdQ%xdR%xdS%xdT%xdU%xdV|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX%xdY|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX%xdY%xdZ>
+%al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt  
+%?ps<%xdB>
+%?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd>
+%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
+%?mh<%xdF>
+%?pv<|%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi>
+%?bl<|%xdDa|%xdDb|%xdDc|%xdDd|%xdDe|%xdDf|%xdDg|%xdDh|%xdDi|%xdDj|%xdDk>
diff --git a/wps/Rockboxed.160x128x2.wps b/wps/Rockboxed.160x128x2.wps
index 8b6df8c..328d86d 100644
--- a/wps/Rockboxed.160x128x2.wps
+++ b/wps/Rockboxed.160x128x2.wps
@@ -1,39 +1,14 @@
 # (C) 2007, Roan Horning <roan@horning.us>
 # License: GNU GPL v2 or later.
 %wd
-%X|bg-160x128x2.bmp|0|0|
+%X|bg-160x128x2.bmp|
 %P|pg-grey-140.bmp|
-%xl|p|ply-grey-big.bmp|72|109|
-%xl|q|ps-grey-big.bmp|72|109|
-%xl|f|ff-grey-big.bmp|72|109|
-%xl|r|rw-grey-big.bmp|72|109|
-%xl|b|sl-grey-big.bmp|36|109|
-%xl|A|v01-grey-big.bmp|15|109|
-%xl|B|v02-grey-big.bmp|17|109|
-%xl|C|v03-grey-big.bmp|19|109|
-%xl|D|v04-grey-big.bmp|21|109|
-%xl|E|v05-grey-big.bmp|23|109|
-%xl|F|v06-grey-big.bmp|25|109|
-%xl|G|v07-grey-big.bmp|27|109|
-%xl|H|v08-grey-big.bmp|29|109|
-%xl|I|v11-grey-big.bmp|31|109|
-%xl|Z|n-grey-big.bmp|150|113|
-%xl|Y|n-grey-big.bmp|147|113|
-%xl|X|n-grey-big.bmp|144|113|
-%xl|W|n-grey-big.bmp|141|113|
-%xl|V|n-grey-big.bmp|138|113|
-%xl|U|n-grey-big.bmp|135|113|
-%xl|T|n-grey-big.bmp|132|113|
-%xl|S|n-grey-big.bmp|129|113|
-%xl|R|n-grey-big.bmp|126|113|
-%xl|Q|n-grey-big.bmp|123|113|
-%xl|P|l-grey-big.bmp|126|113|
-%xl|O|l-grey-big.bmp|123|113|
-%xl|z|ra-grey-big.bmp|53|109|
-%xl|y|ro-grey-big.bmp|53|109|
-%xl|x|rs-grey-big.bmp|53|109|
-%xl|w|rab-grey-big.bmp|53|109|
-%xl|h|hd-grey-big.bmp|95|108|
+%xl|A|mode-grey.bmp|72|109|4|
+%xl|B|shuffle-grey-big.bmp|36|109|
+%xl|C|volume-grey.bmp|15|111|9|
+%xl|D|battery-grey-big.bmp|123|113|11|
+%xl|E|repeat-grey-big.bmp|53|109|4|
+%xl|F|lock-grey.bmp|95|108|
 
 %al %s%ac%?ia<%ia|%d2>%ar 
 %al %s%ac%?id<%id|%d1>%ar 
@@ -41,10 +16,10 @@
 
 %ac%t3%ig;%ac%iy 
 %pb|5|10|150|
-%al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown>%ar%pt  
-%?ps<%xdb>
-%?mp<%xdq|%xdp|%xdq|%xdf|%xdr>
-%?mm<|%xdz|%xdy|%xdx|%xdw>
-%?mh<%xdh>
-%?pv<|%xdA|%xdA%xdB|%xdA%xdB%xdC|%xdA%xdB%xdC%xdD|%xdA%xdB%xdC%xdD%xdE|%xdA%xdB%xdC%xdD%xdE%xdF|%xdA%xdB%xdC%xdD%xdE%xdF%xdG|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH%xdI>
-%?bl<|%xdO|%xdO%xdP|%xdQ%xdR|%xdQ%xdR%xdS|%xdQ%xdR%xdS%xdT|%xdQ%xdR%xdS%xdT%xdU|%xdQ%xdR%xdS%xdT%xdU%xdV|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX%xdY|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX%xdY%xdZ>
+%al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt  
+%?ps<%xdB>
+%?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd>
+%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
+%?mh<%xdF>
+%?pv<|%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi>
+%?bl<|%xdDa|%xdDb|%xdDc|%xdDd|%xdDe|%xdDf|%xdDg|%xdDh|%xdDi|%xdDj|%xdDk>
diff --git a/wps/Rockboxed/battery-color-small.bmp b/wps/Rockboxed/battery-color-small.bmp
new file mode 100644
index 0000000..e69751c
--- /dev/null
+++ b/wps/Rockboxed/battery-color-small.bmp
diff --git a/wps/Rockboxed/battery-grey-big.bmp b/wps/Rockboxed/battery-grey-big.bmp
new file mode 100644
index 0000000..079f22a
--- /dev/null
+++ b/wps/Rockboxed/battery-grey-big.bmp
diff --git a/wps/Rockboxed/battery-grey-medium.bmp b/wps/Rockboxed/battery-grey-medium.bmp
new file mode 100644
index 0000000..c9cc830
--- /dev/null
+++ b/wps/Rockboxed/battery-grey-medium.bmp
diff --git a/wps/Rockboxed/bg-128x128x16.bmp b/wps/Rockboxed/bg-128x128x16.bmp
index c858b4c..cea0e25 100644
--- a/wps/Rockboxed/bg-128x128x16.bmp
+++ b/wps/Rockboxed/bg-128x128x16.bmp
diff --git a/wps/Rockboxed/bg-132x80x16.bmp b/wps/Rockboxed/bg-132x80x16.bmp
index 254aede..9de6b37 100644
--- a/wps/Rockboxed/bg-132x80x16.bmp
+++ b/wps/Rockboxed/bg-132x80x16.bmp
diff --git a/wps/Rockboxed/bt-color-small.bmp b/wps/Rockboxed/bt-color-small.bmp
deleted file mode 100644
index 7b5ee3d..0000000
--- a/wps/Rockboxed/bt-color-small.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/ff-color-small.bmp b/wps/Rockboxed/ff-color-small.bmp
deleted file mode 100644
index 8e5fc4c..0000000
--- a/wps/Rockboxed/ff-color-small.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/ff-grey-big.bmp b/wps/Rockboxed/ff-grey-big.bmp
deleted file mode 100644
index 44d94f2..0000000
--- a/wps/Rockboxed/ff-grey-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/l-color-small.bmp b/wps/Rockboxed/l-color-small.bmp
deleted file mode 100644
index d989977..0000000
--- a/wps/Rockboxed/l-color-small.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/l-grey-big.bmp b/wps/Rockboxed/l-grey-big.bmp
deleted file mode 100644
index cc007ed..0000000
--- a/wps/Rockboxed/l-grey-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/l-grey-medium.bmp b/wps/Rockboxed/l-grey-medium.bmp
deleted file mode 100644
index 6042d5a..0000000
--- a/wps/Rockboxed/l-grey-medium.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/lock-color.bmp b/wps/Rockboxed/lock-color.bmp
new file mode 100644
index 0000000..1090326
--- /dev/null
+++ b/wps/Rockboxed/lock-color.bmp
diff --git a/wps/Rockboxed/hd-grey-big.bmp b/wps/Rockboxed/lock-grey.bmp
index 8f48489..8f48489 100644
--- a/wps/Rockboxed/hd-grey-big.bmp
+++ b/wps/Rockboxed/lock-grey.bmp
diff --git a/wps/Rockboxed/mode-color-small.bmp b/wps/Rockboxed/mode-color-small.bmp
new file mode 100644
index 0000000..650b9da
--- /dev/null
+++ b/wps/Rockboxed/mode-color-small.bmp
diff --git a/wps/Rockboxed/mode-grey.bmp b/wps/Rockboxed/mode-grey.bmp
new file mode 100644
index 0000000..e47710e
--- /dev/null
+++ b/wps/Rockboxed/mode-grey.bmp
diff --git a/wps/Rockboxed/n-color-small.bmp b/wps/Rockboxed/n-color-small.bmp
deleted file mode 100644
index 8e24124..0000000
--- a/wps/Rockboxed/n-color-small.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/n-grey-big.bmp b/wps/Rockboxed/n-grey-big.bmp
deleted file mode 100644
index a912c7a..0000000
--- a/wps/Rockboxed/n-grey-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/n-grey-medium.bmp b/wps/Rockboxed/n-grey-medium.bmp
deleted file mode 100644
index f9aca4c..0000000
--- a/wps/Rockboxed/n-grey-medium.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/pgln-108.bmp b/wps/Rockboxed/pgln-108.bmp
deleted file mode 100644
index c172e63..0000000
--- a/wps/Rockboxed/pgln-108.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/ply-color-small.bmp b/wps/Rockboxed/ply-color-small.bmp
deleted file mode 100644
index 452a7b4..0000000
--- a/wps/Rockboxed/ply-color-small.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/ply-grey-big.bmp b/wps/Rockboxed/ply-grey-big.bmp
deleted file mode 100644
index dbc35d0..0000000
--- a/wps/Rockboxed/ply-grey-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/ps-color-small.bmp b/wps/Rockboxed/ps-color-small.bmp
deleted file mode 100644
index 7837540..0000000
--- a/wps/Rockboxed/ps-color-small.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/ra-color-small.bmp b/wps/Rockboxed/ra-color-small.bmp
deleted file mode 100644
index a08e079..0000000
--- a/wps/Rockboxed/ra-color-small.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/ra-grey-big.bmp b/wps/Rockboxed/ra-grey-big.bmp
deleted file mode 100644
index 10f21eb..0000000
--- a/wps/Rockboxed/ra-grey-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/ra-grey-medium.bmp b/wps/Rockboxed/ra-grey-medium.bmp
deleted file mode 100644
index 71f106a..0000000
--- a/wps/Rockboxed/ra-grey-medium.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/repeat-color-small.bmp b/wps/Rockboxed/repeat-color-small.bmp
new file mode 100644
index 0000000..5ee500c
--- /dev/null
+++ b/wps/Rockboxed/repeat-color-small.bmp
diff --git a/wps/Rockboxed/rab-grey-big.bmp b/wps/Rockboxed/repeat-grey-big.bmp
index 27368c2..fd5ed6e 100644
--- a/wps/Rockboxed/rab-grey-big.bmp
+++ b/wps/Rockboxed/repeat-grey-big.bmp
diff --git a/wps/Rockboxed/rab-grey-medium.bmp b/wps/Rockboxed/repeat-grey-medium.bmp
index 27b43d7..4e46f9d 100644
--- a/wps/Rockboxed/rab-grey-medium.bmp
+++ b/wps/Rockboxed/repeat-grey-medium.bmp
diff --git a/wps/Rockboxed/ro-color-small.bmp b/wps/Rockboxed/ro-color-small.bmp
deleted file mode 100644
index 3985826..0000000
--- a/wps/Rockboxed/ro-color-small.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/ro-grey-big.bmp b/wps/Rockboxed/ro-grey-big.bmp
deleted file mode 100644
index 7284e90..0000000
--- a/wps/Rockboxed/ro-grey-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/ro-grey-medium.bmp b/wps/Rockboxed/ro-grey-medium.bmp
deleted file mode 100644
index 17fe41e..0000000
--- a/wps/Rockboxed/ro-grey-medium.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/rs-grey-big.bmp b/wps/Rockboxed/rs-grey-big.bmp
deleted file mode 100644
index b0292a9..0000000
--- a/wps/Rockboxed/rs-grey-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/rs-grey-medium.bmp b/wps/Rockboxed/rs-grey-medium.bmp
deleted file mode 100644
index de054e9..0000000
--- a/wps/Rockboxed/rs-grey-medium.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/rw-color-small.bmp b/wps/Rockboxed/rw-color-small.bmp
deleted file mode 100644
index 5fcc14c..0000000
--- a/wps/Rockboxed/rw-color-small.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/rw-grey-big.bmp b/wps/Rockboxed/rw-grey-big.bmp
deleted file mode 100644
index cf02ab5..0000000
--- a/wps/Rockboxed/rw-grey-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/sl-color-small.bmp b/wps/Rockboxed/shuffle-color-small.bmp
index 23d597e..23d597e 100644
--- a/wps/Rockboxed/sl-color-small.bmp
+++ b/wps/Rockboxed/shuffle-color-small.bmp
diff --git a/wps/Rockboxed/sl-grey-big.bmp b/wps/Rockboxed/shuffle-grey-big.bmp
index d44708d..d44708d 100644
--- a/wps/Rockboxed/sl-grey-big.bmp
+++ b/wps/Rockboxed/shuffle-grey-big.bmp
diff --git a/wps/Rockboxed/sl-grey-medium.bmp b/wps/Rockboxed/shuffle-grey-medium.bmp
index 00860b4..00860b4 100644
--- a/wps/Rockboxed/sl-grey-medium.bmp
+++ b/wps/Rockboxed/shuffle-grey-medium.bmp
diff --git a/wps/Rockboxed/v01-grey-big.bmp b/wps/Rockboxed/v01-grey-big.bmp
deleted file mode 100644
index e60efcb..0000000
--- a/wps/Rockboxed/v01-grey-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/v02-grey-big.bmp b/wps/Rockboxed/v02-grey-big.bmp
deleted file mode 100644
index 68c1c17..0000000
--- a/wps/Rockboxed/v02-grey-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/v03-grey-big.bmp b/wps/Rockboxed/v03-grey-big.bmp
deleted file mode 100644
index 76c1350..0000000
--- a/wps/Rockboxed/v03-grey-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/v04-grey-big.bmp b/wps/Rockboxed/v04-grey-big.bmp
deleted file mode 100644
index 2956224..0000000
--- a/wps/Rockboxed/v04-grey-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/v05-grey-big.bmp b/wps/Rockboxed/v05-grey-big.bmp
deleted file mode 100644
index 4b633f6..0000000
--- a/wps/Rockboxed/v05-grey-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/v06-grey-big.bmp b/wps/Rockboxed/v06-grey-big.bmp
deleted file mode 100644
index 773b528..0000000
--- a/wps/Rockboxed/v06-grey-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/v07-grey-big.bmp b/wps/Rockboxed/v07-grey-big.bmp
deleted file mode 100644
index 37cb6c9..0000000
--- a/wps/Rockboxed/v07-grey-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/v08-grey-big.bmp b/wps/Rockboxed/v08-grey-big.bmp
deleted file mode 100644
index 23a68cc..0000000
--- a/wps/Rockboxed/v08-grey-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/v09-color-small.bmp b/wps/Rockboxed/v09-color-small.bmp
deleted file mode 100644
index 75e40c1..0000000
--- a/wps/Rockboxed/v09-color-small.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/v11-grey-big.bmp b/wps/Rockboxed/v11-grey-big.bmp
deleted file mode 100644
index 140dc7f..0000000
--- a/wps/Rockboxed/v11-grey-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/volume-color-small.bmp b/wps/Rockboxed/volume-color-small.bmp
new file mode 100644
index 0000000..57bf6f2
--- /dev/null
+++ b/wps/Rockboxed/volume-color-small.bmp
diff --git a/wps/Rockboxed/volume-grey.bmp b/wps/Rockboxed/volume-grey.bmp
new file mode 100644
index 0000000..6bca93e
--- /dev/null
+++ b/wps/Rockboxed/volume-grey.bmp