Fixes ICON problems

Fixes the missing icon problems in Mozillians.org.

This is a recreated pull request of #672 , To incorporate all the pull request and after fixing a few bugs as mentioned in the comments.