New icons, removed debug stuff