Merged in upstream changes and set scalable to 256x256 instead of 48x48