Added toast, icons