@MartinK
Beautification is probably last step but to make it easier do you have SVG file of your buttons. I found Ranas .svg file but it differs little from Modranas.

http://svn.openstreetmap.org/applica...le/rana/icons/

It would be easier to edit buttons if there is vector file. Making svg where icons are grouped by by screens makes theme editing also bit easier.