Merge "Update sound settings icons" into pi-dev