Cleanup of location and add simple icon cache