Can't you give us the .psd file? Would speare you some time.. But if not, can you fix some icons here?
----------------------------------
Since the author didt want to share the .psd file.. I makd one thats good enough for me..
Here you got it Hope you all will like it, not that hard.. Just copy your icon in the .psd file, and then use magic tool ;D http://files-upload.com/files/635677/iconchange.psd
----------------------------------
After a little modification I end up like this, great work here