Fixes: #2937 Using new icon system