Made the use of icons optional