diff --git a/.hgignore b/.hgignore
index bd4f19a91e985dd5916c6c8b5a745c581cf32093..e3ad4fe7b2476111e8f027a4bd07ee5696886be7 100644
--- a/.hgignore
+++ b/.hgignore
@@ -33,6 +33,7 @@ indra/newview/character
 indra/newview/fmod.dll
 indra/newview/mozilla-theme
 indra/newview/mozilla-universal-darwin.tgz
+indra/newview/res/ll_icon.*
 indra/newview/res-sdl
 indra/newview/vivox-runtime
 indra/server-linux-*
diff --git a/doc/contributions.txt b/doc/contributions.txt
index ee56ef36653ac97c63c93a8929d8d4d9f3f3e3e9..b7be56e6c37499877d4ec9add938acf39028ce5e 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -454,6 +454,8 @@ Jonathan Yap
 	STORM-1273
 	STORM-1462
 	STORM-1459
+Kadah Coba
+    STORM-1060
 Kage Pixel
 	VWR-11
 Ken March
@@ -540,6 +542,7 @@ Michelle2 Zenovka
 	VWR-8889
 	VWR-8310
 	VWR-9499
+    STORM-1060
 Mm Alder
 	SNOW-376
 	VWR-197
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 935dd2e88753810e4f9771b9c000abe9c595f369..f87ecbd2f5a6ad3737ee60fad50f63906d24f0e9 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1248,6 +1248,31 @@ if (WINDOWS)
         set(viewer_SOURCE_FILES "${viewer_SOURCE_FILES}" llviewerprecompiledheaders.cpp)
     endif(USE_PRECOMPILED_HEADERS)
 
+    # Replace the icons with the appropriate ones for the channel
+    set(ICON_PATH "test")
+    string(TOLOWER ${VIEWER_CHANNEL} channel_lower)
+    if(channel_lower MATCHES "^(release|beta|development)")
+        set(ICON_PATH ${channel_lower})
+    elseif(channel_lower MATCHES "^(project.*)")
+        set(ICON_PATH "project")
+    endif()
+    message("Copying icons for ${ICON_PATH}")
+    execute_process(
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different
+        "${CMAKE_CURRENT_SOURCE_DIR}/icons/${ICON_PATH}/secondlife.ico"
+        "${CMAKE_CURRENT_SOURCE_DIR}/res/ll_icon.ico"
+      )
+    execute_process(
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different
+        "${CMAKE_CURRENT_SOURCE_DIR}/icons/${ICON_PATH}/secondlife_256.BMP"
+        "${CMAKE_CURRENT_SOURCE_DIR}/res/ll_icon.BMP"
+      )
+    execute_process(
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different
+        "${CMAKE_CURRENT_SOURCE_DIR}/icons/${ICON_PATH}/secondlife_256.BMP"
+        "${CMAKE_CURRENT_SOURCE_DIR}/res-sdl/ll_icon.BMP"
+      )
+
     # Add resource files to the project.
     # viewerRes.rc is the only buildable file, but
     # the rest are all dependencies of it.
@@ -1277,6 +1302,7 @@ if (WINDOWS)
         res/lltooltranslate.cur
         res/lltoolzoomin.cur
         res/lltoolzoomout.cur
+        res-sdl/ll_icon.BMP
         res/ll_icon.BMP
         res/ll_icon.ico
         res/resource.h
diff --git a/indra/newview/res-sdl/ll_icon.BMP b/indra/newview/res-sdl/ll_icon.BMP
deleted file mode 100644
index 6f9366df41ea2e93bad37ae347c7ec7b07541b75..0000000000000000000000000000000000000000
Binary files a/indra/newview/res-sdl/ll_icon.BMP and /dev/null differ
diff --git a/indra/newview/res/ll_icon.BMP b/indra/newview/res/ll_icon.BMP
deleted file mode 100644
index 3a9964cd9544c31d1b824fc29826f5ae2da35555..0000000000000000000000000000000000000000
Binary files a/indra/newview/res/ll_icon.BMP and /dev/null differ
diff --git a/indra/newview/res/ll_icon.ico b/indra/newview/res/ll_icon.ico
deleted file mode 100644
index 87985b9285118128e6e9e3eb344fdde0b60481d7..0000000000000000000000000000000000000000
Binary files a/indra/newview/res/ll_icon.ico and /dev/null differ
diff --git a/indra/newview/res/ll_icon.png b/indra/newview/res/ll_icon.png
deleted file mode 100644
index ae573b3874a253c24d8050f2ef4439742f51ee94..0000000000000000000000000000000000000000
Binary files a/indra/newview/res/ll_icon.png and /dev/null differ