I decided not to mask the icons and opted for pre-masked PNGs because I couldn't match the style as well as I could in Photoshop. Yours is looking very good though. Maybe we should merge?
I didn't have the time to do a custom one for my last project so we stayed with the standard blue in the end.
Edit: nice work though! Nice to see a thorough explanation of your thinking.