Some cleanup and a fix for the disc icons