Core optimization

check icon avalybility
Revert "Core optimization"

This reverts commit e590e4c51899e18023efa0940b90ef2009d83c9a.