Moved icon handling to generic Block Class