Some icon changes, some Google API failure changes (more graceful handling).  Can be abstracted better, will come in the future.