Fix type issue
Remove caching until headers are set correctly
Update icons