Made some changes on icon's different state