Improve icon fetching code, to catch much more icons much faster