Update to new API
Update images
Update icons