Addresses #145, drawing colors revised and matched with their icon.