[minor] Improved and simplified the default icon behavior.