cleaned up rescue blocks to prevent memory leak.  Cleaned up icons a bit more.