Updated version (to reflect addition of square icon set).