Removed icon handling from Block, now handled by json models