diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index f87ecbd2f5a6ad3737ee60fad50f63906d24f0e9..f6ebf331bb0fa76ae586361006210a4658eb7295 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1249,10 +1249,13 @@ if (WINDOWS)
     endif(USE_PRECOMPILED_HEADERS)
 
     # Replace the icons with the appropriate ones for the channel
+    # ('test' is the default)
     set(ICON_PATH "test")
     string(TOLOWER ${VIEWER_CHANNEL} channel_lower)
-    if(channel_lower MATCHES "^(release|beta|development)")
+    if(channel_lower MATCHES "^(release|development)")
         set(ICON_PATH ${channel_lower})
+    elseif(channel_lower MATCHES "^(beta.*)")
+        set(ICON_PATH "beta")
     elseif(channel_lower MATCHES "^(project.*)")
         set(ICON_PATH "project")
     endif()
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 07382e8e859fbc89f1670c73941599e27246f3ae..37099bf29b9d7bbc6aef7ded775b7de35e6acd93 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -147,10 +147,11 @@ class ViewerManifest(LLManifest):
         icon_path="icons/"
         channel_type=self.channel_lowerword()
         if channel_type == 'release' \
-        or channel_type == 'betaviewer' \
         or channel_type == 'development' \
         :
             icon_path += channel_type
+        elif channel_type == 'betaviewer' :
+            icon_path += 'beta'
         elif re.match('project.*',channel_type) :
             icon_path += 'project'
         else :