Merge "Update ROM Control icons, with cleaner versions and proper transparency." into jb-mr1