Fixes: #2932 Using icon naming spec