Tidied up drawing icons