These changes have been tested in-device!

The only stuff left are the images.