diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index a78bfc5450..c789249b7f 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1520,7 +1520,7 @@ if (DARWIN)
 
   # Add resource files to the project.
   set(viewer_RESOURCE_FILES
-    phoenix_icon.icns
+    firestorm_icon.icns
     macview.r
     gpu_table.txt
     Info-Firestorm.plist
@@ -2249,8 +2249,8 @@ if (DARWIN)
     ${VIEWER_BINARY_NAME}
     PROPERTIES
     OUTPUT_NAME "${product}"
-    MACOSX_BUNDLE_INFO_STRING "Second Life Viewer"
-    MACOSX_BUNDLE_ICON_FILE "phoenix_icon.icns"
+    MACOSX_BUNDLE_INFO_STRING "Firestorm Viewer"
+    MACOSX_BUNDLE_ICON_FILE "firestorm_icon.icns"
     MACOSX_BUNDLE_GUI_IDENTIFIER "com.firestorm.indra.viewer" #<FS:TM>
     MACOSX_BUNDLE_LONG_VERSION_STRING "${VIEWER_CHANNEL} ${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}"
     MACOSX_BUNDLE_BUNDLE_NAME "Firestorm"
diff --git a/indra/newview/Info-Firestorm.plist b/indra/newview/Info-Firestorm.plist
index 5dbb8ae008..2b5f850311 100644
--- a/indra/newview/Info-Firestorm.plist
+++ b/indra/newview/Info-Firestorm.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Firestorm</string>
 	<key>CFBundleIconFile</key>
-	<string>phoenix_icon.icns</string>
+	<string>firestorm_icon.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.firestorm.indra.viewer</string>
 	<key>CFBundleInfoDictionaryVersion</key>
diff --git a/indra/newview/firestorm_icon.icns b/indra/newview/firestorm_icon.icns
new file mode 100644
index 0000000000..a39d58ea70
Binary files /dev/null and b/indra/newview/firestorm_icon.icns differ
diff --git a/indra/newview/icons/beta/firestorm_icon.icns b/indra/newview/icons/beta/firestorm_icon.icns
new file mode 100644
index 0000000000..a39d58ea70
Binary files /dev/null and b/indra/newview/icons/beta/firestorm_icon.icns differ
diff --git a/indra/newview/icons/beta/phoenix_icon.icns b/indra/newview/icons/beta/phoenix_icon.icns
deleted file mode 100644
index 2f1125b6ca..0000000000
Binary files a/indra/newview/icons/beta/phoenix_icon.icns and /dev/null differ
diff --git a/indra/newview/icons/development/firestorm_icon.icns b/indra/newview/icons/development/firestorm_icon.icns
new file mode 100644
index 0000000000..a39d58ea70
Binary files /dev/null and b/indra/newview/icons/development/firestorm_icon.icns differ
diff --git a/indra/newview/icons/development/phoenix_icon.icns b/indra/newview/icons/development/phoenix_icon.icns
deleted file mode 100644
index 2f1125b6ca..0000000000
Binary files a/indra/newview/icons/development/phoenix_icon.icns and /dev/null differ
diff --git a/indra/newview/icons/private/firestorm_icon.icns b/indra/newview/icons/private/firestorm_icon.icns
new file mode 100644
index 0000000000..a39d58ea70
Binary files /dev/null and b/indra/newview/icons/private/firestorm_icon.icns differ
diff --git a/indra/newview/icons/private/phoenix_icon.icns b/indra/newview/icons/private/phoenix_icon.icns
deleted file mode 100644
index 2f1125b6ca..0000000000
Binary files a/indra/newview/icons/private/phoenix_icon.icns and /dev/null differ
diff --git a/indra/newview/icons/project/firestorm_icon.icns b/indra/newview/icons/project/firestorm_icon.icns
new file mode 100644
index 0000000000..a39d58ea70
Binary files /dev/null and b/indra/newview/icons/project/firestorm_icon.icns differ
diff --git a/indra/newview/icons/project/phoenix_icon.icns b/indra/newview/icons/project/phoenix_icon.icns
deleted file mode 100644
index 2f1125b6ca..0000000000
Binary files a/indra/newview/icons/project/phoenix_icon.icns and /dev/null differ
diff --git a/indra/newview/icons/release/firestorm_icon.icns b/indra/newview/icons/release/firestorm_icon.icns
new file mode 100644
index 0000000000..a39d58ea70
Binary files /dev/null and b/indra/newview/icons/release/firestorm_icon.icns differ
diff --git a/indra/newview/icons/release/phoenix_icon.icns b/indra/newview/icons/release/phoenix_icon.icns
deleted file mode 100644
index 2f1125b6ca..0000000000
Binary files a/indra/newview/icons/release/phoenix_icon.icns and /dev/null differ
diff --git a/indra/newview/icons/test/firestorm_icon.icns b/indra/newview/icons/test/firestorm_icon.icns
new file mode 100644
index 0000000000..a39d58ea70
Binary files /dev/null and b/indra/newview/icons/test/firestorm_icon.icns differ
diff --git a/indra/newview/icons/test/phoenix_icon.icns b/indra/newview/icons/test/phoenix_icon.icns
deleted file mode 100644
index 2f1125b6ca..0000000000
Binary files a/indra/newview/icons/test/phoenix_icon.icns and /dev/null differ
diff --git a/indra/newview/phoenix_icon.icns b/indra/newview/phoenix_icon.icns
deleted file mode 100644
index 2f1125b6ca..0000000000
Binary files a/indra/newview/phoenix_icon.icns and /dev/null differ
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 007d94f78d..f9d1941fb7 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -801,7 +801,7 @@ class DarwinManifest(ViewerManifest):
 
                 icon_path = self.icon_path()
                 if self.prefix(src=icon_path, dst="") :
-                    self.path("phoenix_icon.icns")
+                    self.path("firestorm_icon.icns")
                     self.end_prefix(icon_path)
 
                 self.path("Firestorm.nib")