Made some changes to the way icons are being used - icons now are
created only once , then used every where later.