Fixes: #2937 Using new icon system
Fixes: #2937 Fixing icon paths