Fix class check, screen icons, library search message.