diff --git a/Tools/XcodeCapp/XcodeCapp/AppController.m b/Tools/XcodeCapp/XcodeCapp/AppController.m
index 65bec8ff3..570325dae 100644
--- a/Tools/XcodeCapp/XcodeCapp/AppController.m
+++ b/Tools/XcodeCapp/XcodeCapp/AppController.m
@@ -139,7 +139,7 @@ AppController *SharedAppControllerInstance = nil;
 - (NSImage *)iconActive
 {
     if (!_iconActive)
-        _iconActive = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForImageResource:@"icon-active.png"]];
+        _iconActive = [NSImage imageNamed:@"icon-active"];
 
     return _iconActive;
 }
@@ -147,7 +147,7 @@ AppController *SharedAppControllerInstance = nil;
 - (NSImage *)iconInactive
 {
     if (!_iconInactive)
-        _iconInactive = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForImageResource:@"icon-inactive.png"]];
+        _iconInactive = [NSImage imageNamed:@"icon-inactive"];
 
     return _iconInactive;
 }
@@ -155,7 +155,7 @@ AppController *SharedAppControllerInstance = nil;
 - (NSImage *)iconWorking
 {
     if (!_iconWorking)
-        _iconWorking = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForImageResource:@"icon-working.png"]];
+        _iconWorking = [NSImage imageNamed:@"icon-working"];
 
     return _iconWorking;
 }
diff --git a/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp icons/icon_128x128.psd b/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp icons/icon_128x128.psd
index cbc052cf5..f9b147f49 100644
Binary files a/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp icons/icon_128x128.psd and b/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp icons/icon_128x128.psd differ
diff --git a/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp icons/icon_256x256.psd b/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp icons/icon_256x256.psd
index 6f7fc0c15..e51922d81 100644
Binary files a/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp icons/icon_256x256.psd and b/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp icons/icon_256x256.psd differ
diff --git a/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp icons/icon_32x32.psd b/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp icons/icon_32x32.psd
index 458a77966..de7233474 100644
Binary files a/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp icons/icon_32x32.psd and b/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp icons/icon_32x32.psd differ
diff --git a/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp icons/icon_512x512@2x.psd b/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp icons/icon_512x512@2x.psd
index 628d0501b..febb1a0a8 100644
Binary files a/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp icons/icon_512x512@2x.psd and b/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp icons/icon_512x512@2x.psd differ
diff --git a/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp.icns b/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp.icns
new file mode 100644
index 000000000..628a931f0
Binary files /dev/null and b/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp.icns differ
diff --git a/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp.iconset/icon_128x128.png b/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp.iconset/icon_128x128.png
index 2f2b12c41..ae7b61b39 100644
Binary files a/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp.iconset/icon_128x128.png and b/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp.iconset/icon_128x128.png differ
diff --git a/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp.iconset/icon_32x32.png b/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp.iconset/icon_32x32.png
index c3287a5fd..d852f1502 100644
Binary files a/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp.iconset/icon_32x32.png and b/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp.iconset/icon_32x32.png differ
diff --git a/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp.iconset/icon_512x512@2x.png b/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp.iconset/icon_512x512@2x.png
index 6e1c696ab..39c65d24c 100644
Binary files a/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp.iconset/icon_512x512@2x.png and b/Tools/XcodeCapp/XcodeCapp/Resources/XcodeCapp.iconset/icon_512x512@2x.png differ
diff --git a/Tools/XcodeCapp/XcodeCapp/Resources/help.rtfd/TXT.rtf b/Tools/XcodeCapp/XcodeCapp/Resources/help.rtfd/TXT.rtf
index 5a62de3df..63d7d22b6 100644
--- a/Tools/XcodeCapp/XcodeCapp/Resources/help.rtfd/TXT.rtf
+++ b/Tools/XcodeCapp/XcodeCapp/Resources/help.rtfd/TXT.rtf
@@ -350,7 +350,7 @@ The first three are mentioned above. \'93React to inode meta information changes
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
-\b0\fs24 \cf0 Ultimately XcodeCapp is a bit of a hack. It is doing all kinds of processing behind Xcode\'92s back, so to speak, and occasionally Xcode may get out of sync with your source files. In such cases, you can reset XcodeCapp by following these steps:\
+\b0\fs24 \cf0 Ultimately XcodeCapp is a bit of a hack \'97 an elegant hack, but a hack nonetheless. It is doing all kinds of processing behind Xcode\'92s back, so to speak, and occasionally Xcode may get out of sync with your source files. In such cases, you can reset XcodeCapp by following these steps:\
 \
 \pard\tx220\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\pardirnatural
 \ls10\ilvl0\cf0 {\listtext	1.	}If XcodeCapp has your project open, select Close \'93<project>\'94 from the XcodeCapp menu.\